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

cli: allow node operator to rollback last state (backport #7033) #7080

Merged
merged 4 commits into from Oct 8, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 8, 2021

This is an automatic backport of pull request #7033 done by Mergify.
Cherry-pick of 4ca130d has failed:

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

You are currently cherry-picking commit 4ca130d22.
  (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:
	new file:   cmd/tendermint/commands/rollback.go
	modified:   test/e2e/app/app.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG_PENDING.md
	deleted by us:   cmd/tendermint/commands/reindex_event.go
	both modified:   cmd/tendermint/main.go
	both modified:   state/state.go
	added by them:   types/time/rollback.go
	added by them:   types/time/rollback_test.go

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.io/

(cherry picked from commit 4ca130d)

# Conflicts:
#	CHANGELOG_PENDING.md
#	cmd/tendermint/commands/reindex_event.go
#	cmd/tendermint/main.go
#	state/state.go
#	types/time/rollback.go
#	types/time/rollback_test.go
CHANGELOG_PENDING.md Outdated Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant