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: remove iavl-lazy-loading from config (backport #17177) #17178

Merged
merged 2 commits into from
Jul 28, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2023

This is an automatic backport of pull request #17177 done by Mergify.
Cherry-pick of 898f66a has failed:

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

You are currently cherry-picking commit 898f66aac.
  (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:   UPGRADING.md
	modified:   server/config/config.go
	modified:   server/config/toml.go
	modified:   server/mock/store.go
	modified:   tools/confix/data/v0.50-app.toml

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

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 898f66a)

# Conflicts:
#	CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner July 28, 2023 13:32
@mergify mergify bot added the conflicts label Jul 28, 2023
@github-actions github-actions bot added the C:Confix Issues and PR related to Confix label Jul 28, 2023
@julienrbrt julienrbrt enabled auto-merge (squash) July 28, 2023 13:38
@julienrbrt julienrbrt merged commit 4d139f8 into release/v0.50.x Jul 28, 2023
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17177 branch July 28, 2023 13:52
@faddat faddat mentioned this pull request Nov 8, 2024
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C:Confix Issues and PR related to Confix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant