Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master into develop by way of 4.1-turbo-pickles #6876

Merged
merged 13 commits into from
Nov 30, 2020
Merged

Merge master into develop by way of 4.1-turbo-pickles #6876

merged 13 commits into from
Nov 30, 2020

Conversation

lk86
Copy link
Contributor

@lk86 lk86 commented Nov 30, 2020

Thank you for contributing to Coda! Please see CONTRIBUTING.md if you haven't
yet. In that doc, there are more details around how to start our CI.

Explain your changes here.

Explain how you tested your changes here.

Checklist:

  • Document code purpose, how to use it
    • Mention expected invariants, implicit constraints
  • Tests were added for the new behavior
    • Document test purpose, significance of failures
    • Test names should reflect their purpose
  • All tests pass (CI will check this if you didn't)
  • Serialized types are in stable-versioned modules
  • Does this close issues? List them:

Closes #0000
Closes #0000

@lk86 lk86 requested a review from a team as a code owner November 30, 2020 18:14
@lk86 lk86 added the ci-build-me Add this label to trigger a circle+buildkite build for this branch label Nov 30, 2020
@lk86 lk86 merged commit 04e023f into develop Nov 30, 2020
@lk86 lk86 deleted the 4.1-turbo-pickles branch November 30, 2020 21:45
mrmr1993 added a commit that referenced this pull request Dec 1, 2020
@mrmr1993
Revert "Merge pull request #6876 from MinaProtocol/4.1-turbo-pickles"
84afd38 
This reverts commit 04e023f, reversing
changes made to f7760e2.
mrmr1993 added a commit that referenced this pull request Dec 1, 2020
@mrmr1993
Merge pull request #6890 from MinaProtocol/fix/unbreak-everything
f609ad0 
Revert "Merge pull request #6876 from MinaProtocol/4.1-turbo-pickles"
This was referenced Dec 1, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
ci-build-me Add this label to trigger a circle+buildkite build for this branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lk86 @nholland94 @imeckler