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

feat(server): in-place testnet creator (backport #19280) #19405

Merged
merged 4 commits into from
Feb 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2024

This is an automatic backport of pull request #19280 done by Mergify.
Cherry-pick of 89df28c has failed:

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

You are currently cherry-picking commit 89df28ceb.
  (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:   baseapp/options.go
	modified:   server/util.go

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/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

(cherry picked from commit 89df28c)

# Conflicts:
#	CHANGELOG.md
#	server/start.go
@mergify mergify bot requested a review from a team as a code owner February 12, 2024 10:57
@mergify mergify bot added the conflicts label Feb 12, 2024
server/start.go Dismissed Show dismissed Hide dismissed
Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

utACK

@julienrbrt julienrbrt enabled auto-merge (squash) February 13, 2024 19:30
@julienrbrt julienrbrt merged commit c122a3d into release/v0.50.x Feb 15, 2024
45 of 47 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-19280 branch February 15, 2024 07:52
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.

3 participants