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

fix: do not overwrite comet config when set in InterceptConfigsPreRunHandler (backport #16395) #16399

Merged
merged 2 commits into from
Jun 1, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 1, 2023

This is an automatic backport of pull request #16395 done by Mergify.
Cherry-pick of 0bded0d has failed:

On branch mergify/bp/release/v0.47.x/pr-16395
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit 0bded0d19.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   server/util.go

no changes added to commit (use "git add" and/or "git commit -a")

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

…nHandler` (#16395)

(cherry picked from commit 0bded0d)

# Conflicts:
#	CHANGELOG.md
#	server/util.go
@mergify mergify bot requested a review from a team as a code owner June 1, 2023 11:25
@mergify mergify bot added the conflicts label Jun 1, 2023
server/util.go Fixed Show fixed Hide fixed
@julienrbrt julienrbrt enabled auto-merge (squash) June 1, 2023 11:43
@julienrbrt julienrbrt merged commit 2e70efc into release/v0.47.x Jun 1, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.47.x/pr-16395 branch June 1, 2023 12:04
roy-dydx pushed a commit to dydxprotocol/cosmos-sdk that referenced this pull request Jul 11, 2023
…nHandler` (backport cosmos#16395) (cosmos#16399)

Co-authored-by: Julien Robert <julien@rbrt.fr>
kakysha pushed a commit to InjectiveLabs/cosmos-sdk that referenced this pull request Aug 15, 2023
…nHandler` (backport cosmos#16395) (cosmos#16399)

Co-authored-by: Julien Robert <julien@rbrt.fr>
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.

None yet

1 participant