Merge 1.2.0 back to compatible #9188
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
improve-bad-balance-scripting Add conditional for the ----- lines
Upgrade ocaml-rs, tweak some bindings to be safer
This reverts commit 24ae4de.
[hotfix] Revert staged ledger diff changes
…-the-tip Fix/super catchup stuck at the tip
Wrap a couple of `Process.run`
…ad-release `get_ledger` in sys thread for release
mrmr1993
added
the
ci-build-me
lk86
approved these changes
Jul 12, 2021
|
Some of the constituent PRs in this still need review.
|
|
#8998 has no major changes, so LGTM from that point of view, still left some comments there. |
|
Merging to keep the two branches in sync, further work for #8998 can land as part of a future PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains the changes from 1.2.0, with merge conflicts resolved, with a few additional changes to fix the build.