Skip to content

[R4R] develop branch catch up master#676

Merged
unclezoro merged 10 commits intodevelopfrom
catch_up_master
Dec 27, 2021
Merged

[R4R] develop branch catch up master#676
unclezoro merged 10 commits intodevelopfrom
catch_up_master

Conversation

@unclezoro
Copy link
Copy Markdown
Contributor

@unclezoro unclezoro commented Dec 20, 2021

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

unclezoro and others added 9 commits November 29, 2021 14:08
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 unclezoro changed the title [R4R]Catch up master [WIP]Catch up master Dec 20, 2021
@unclezoro unclezoro force-pushed the catch_up_master branch 2 times, most recently from a88cae4 to 151ee96 Compare December 20, 2021 03:53
@unclezoro unclezoro closed this Dec 20, 2021
@unclezoro unclezoro reopened this Dec 20, 2021
@unclezoro unclezoro changed the title [WIP]Catch up master [R4R]Catch up master Dec 20, 2021
@unclezoro unclezoro changed the title [R4R]Catch up master [R4R] develop branch catch up master Dec 20, 2021
@unclezoro unclezoro requested a review from keefel December 20, 2021 04:31
@unclezoro unclezoro merged commit ffb7f4a into develop Dec 27, 2021
@unclezoro unclezoro deleted the catch_up_master branch May 10, 2022 12:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants