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

Make it possible to configure per-node runtime parameter limits (backport #7917) #7920

Merged
merged 7 commits into from
Apr 18, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 18, 2023

This is an automatic backport of pull request #7917 done by Mergify.
Cherry-pick of 13a37f5 has failed:

On branch mergify/bp/v3.12.x/pr-7917
Your branch is ahead of 'origin/v3.12.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 13a37f512b.
  (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:   deps/rabbit/priv/schema/rabbit.schema

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

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

Alex Valiushko added 6 commits April 18, 2023 06:38
(cherry picked from commit 29d7d63)
(cherry picked from commit 13a37f5)

# Conflicts:
#	deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
(cherry picked from commit 3bb024d)
(cherry picked from commit 127dca7)
(cherry picked from commit 06eee8e)
(cherry picked from commit 4c30d9a)
@michaelklishin michaelklishin merged commit 81de3ea into v3.12.x Apr 18, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-7917 branch April 18, 2023 12:56
michaelklishin added a commit that referenced this pull request Apr 18, 2023
Make it possible to configure per-node runtime parameter limits (backport #7917) (backport #7920)
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.

1 participant