Merge develop to big merge v1.10.16 v1.12.2#1856
Merged
brilliant-lx merged 10 commits intobig_merge_v1.10.16_v1.12.2from Sep 8, 2023
Merged
Merge develop to big merge v1.10.16 v1.12.2#1856brilliant-lx merged 10 commits intobig_merge_v1.10.16_v1.12.2from
brilliant-lx merged 10 commits intobig_merge_v1.10.16_v1.12.2from
Conversation
discov: add hardcoded bootnodes
195824e to
b5e862b
Compare
zlacfzy
previously approved these changes
Sep 7, 2023
* cmd: remove genesis from config.toml * cmd: add check for port number
brilliant-lx
approved these changes
Sep 8, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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
Merge develop to big merge v1.10.16 v1.12.2
Rationale
resolve conflicts
Example
make testpassChanges
Notable changes: