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

refactor: prune everything (backport #11177) #11259

Merged
merged 4 commits into from
Feb 24, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2022

This is an automatic backport of pull request #11177 done by Mergify.
Cherry-pick of 75bcf47 has failed:

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

You are currently cherry-picking commit 75bcf47f1.
  (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:   server/config/config.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   server/config/toml.go
	both modified:   server/start.go
	both modified:   store/rootmulti/store.go
	both modified:   store/types/pruning.go
	deleted by us:   store/v2/multi/store_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.com

(cherry picked from commit 75bcf47)

# Conflicts:
#	CHANGELOG.md
#	server/config/toml.go
#	server/start.go
#	store/rootmulti/store.go
#	store/types/pruning.go
#	store/v2/multi/store_test.go
@lgtm-com
Copy link

lgtm-com bot commented Feb 23, 2022

This pull request introduces 3 alerts when merging 358c9fc into 7875835 - view on LGTM.com

new alerts:

  • 2 for Useless assignment to local variable
  • 1 for Unreachable statement

@robert-zaremba
Copy link
Collaborator

@alexanderbez could you solve conflicts?

@alexanderbez
Copy link
Contributor

@alexanderbez could you solve conflicts?

Yes, ofc.

@alexanderbez alexanderbez merged commit 6268a93 into release/v0.44.x Feb 24, 2022
@alexanderbez alexanderbez deleted the mergify/bp/release/v0.44.x/pr-11177 branch February 24, 2022 14:58
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.

2 participants