[R4R] develop branch catch up master #676
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
Co-authored-by: Martin Holst Swende <martin@swende.se>
Co-authored-by: ucwong <ucwong@126.com>
* reannouce local pending transactions * add tests for tx_pool reannouce local pending transactions * add tests for handler reannounce local pending transactions
* ci: add pre release ci flow * ci: fix change log format
[R4R]fix state inconsistent when doing diffsync
unclezoro
force-pushed
the
catch_up_master
branch
2 times, most recently
from
a88cae4 to
151ee96
Compare
unclezoro
force-pushed
the
catch_up_master
branch
from
151ee96 to
3a41924
Compare
keefel
approved these changes
Dec 20, 2021
yutianwu
approved these changes
Dec 23, 2021
kyrie-yl
approved these changes
Dec 24, 2021
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.
Description
This PR just make the develop branch to sync with master branch.
Rationale
When we do the v1.1.7 release, it goes to master branch directly, now we merge the diff back to develop branch.
Example
add an example CLI or API response...
Changes
No