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.

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

Revert "config: add bootstrap peers (#9680)" (backport #1109) #1121

Merged
merged 2 commits into from
Jul 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 14, 2023

This is an automatic backport of pull request #1109 done by Mergify.
Cherry-pick of 2d3ee28 has failed:

On branch mergify/bp/v0.38.x/pr-1109
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 2d3ee28e8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   cmd/cometbft/commands/run_node.go
	modified:   config/config.go
	modified:   node/node.go
	modified:   spec/p2p/legacy-docs/config.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   UPGRADING.md
	both modified:   config/toml.go
	both modified:   docs/core/configuration.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot requested review from a team as code owners July 14, 2023 14:22
@mergify mergify bot added the conflicts label Jul 14, 2023
@cason cason force-pushed the mergify/bp/v0.38.x/pr-1109 branch from f8a6865 to e5071cc Compare July 14, 2023 15:24
* Revert "config: add bootstrap peers (#9680)"

This reverts commit f12588a.

* docs/p2p: bootstrap_peers config flag removed

(cherry picked from commit 2d3ee28)

# Conflicts:
#	UPGRADING.md
#	config/toml.go
#	docs/core/configuration.md
@cason cason force-pushed the mergify/bp/v0.38.x/pr-1109 branch from e5071cc to a0a2484 Compare July 14, 2023 15:27
@@ -311,7 +306,7 @@ broadcast = true

# WalPath (default: "") configures the location of the Write Ahead Log
# (WAL) for the mempool. The WAL is disabled by default. To enable, set
# WalPath to where you want the WAL to be written (e.g.
# wal_dir to where you want the WAL to be written (e.g.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably was introduced by mistake by a concurrent backport. Sticking to the name of the variable on line 316/311 below.

@cason cason removed the conflicts label Jul 14, 2023
@cason cason merged commit d4bbdde into v0.38.x Jul 14, 2023
19 checks passed
@cason cason deleted the mergify/bp/v0.38.x/pr-1109 branch July 14, 2023 15:36
thanethomson added a commit that referenced this pull request Jul 14, 2023
Signed-off-by: Thane Thomson <connect@thanethomson.com>
@thanethomson thanethomson mentioned this pull request Jul 14, 2023
3 tasks
thanethomson added a commit that referenced this pull request Jul 14, 2023
* version: Bump to v0.38.0-rc3

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Remove changelog entry relating to #1121

Signed-off-by: Thane Thomson <connect@thanethomson.com>

* Rebuild changelog

Signed-off-by: Thane Thomson <connect@thanethomson.com>

---------

Signed-off-by: Thane Thomson <connect@thanethomson.com>
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.

1 participant