Skip to content

cmd: add tool for compaction of goleveldb (backport #8564)#8674

Merged
cmwaters merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-8564
Jun 21, 2022
Merged

cmd: add tool for compaction of goleveldb (backport #8564)#8674
cmwaters merged 4 commits intov0.34.xfrom
mergify/bp/v0.34.x/pr-8564

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jun 2, 2022

This is an automatic backport of pull request #8564 done by Mergify.
Cherry-pick of 30bfe51 has failed:

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

You are currently cherry-picking commit 30bfe51eb.
  (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/compact.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   cmd/tendermint/main.go
	both modified:   go.mod
	both modified:   go.sum

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

(cherry picked from commit 30bfe51)

# Conflicts:
#	cmd/tendermint/main.go
#	go.mod
#	go.sum
debug.GetDebugCommand(logger),
commands.NewCompletionCmd(rcmd, true),
commands.MakeCompactDBCommand(conf, logger),
>>>>>>> 30bfe51eb (cmd: add tool for compaction of goleveldb (#8564))
Copy link
Contributor

Choose a reason for hiding this comment

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

This code has merge conflicts. Could you please fix those?

@github-actions
Copy link

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@github-actions github-actions bot added the stale for use by stalebot label Jun 20, 2022
@cmwaters cmwaters removed the stale for use by stalebot label Jun 20, 2022
@cmwaters cmwaters merged commit fe02452 into v0.34.x Jun 21, 2022
@cmwaters cmwaters deleted the mergify/bp/v0.34.x/pr-8564 branch June 21, 2022 21:04
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.

2 participants