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

Add Classic Queue version to operator policies (backport #9547) (backport #9548) #9549

Merged
merged 5 commits into from
Sep 27, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 27, 2023

This is an automatic backport of pull request #9548 done by Mergify.
Cherry-pick of 24797c5 has failed:

On branch mergify/bp/v3.11.x/pr-9548
Your branch is up to date with 'origin/v3.11.x'.

You are currently cherry-picking commit 24797c5a12.
  (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
	modified:   deps/rabbit/src/rabbit_policies.erl
	modified:   deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/test/policy_SUITE.erl
	both modified:   deps/rabbitmq_management/priv/www/js/tmpl/policies.ejs

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

SignalWhisperer and others added 2 commits September 27, 2023 02:55
(cherry picked from commit 8c6ba6d)
(cherry picked from commit 24797c5)

# Conflicts:
#	deps/rabbit/test/policy_SUITE.erl
#	deps/rabbitmq_management/priv/www/js/tmpl/policies.ejs
As it only makes sense for main.

(cherry picked from commit f2f2688)
(cherry picked from commit 941043e)
@mergify mergify bot added the conflicts label Sep 27, 2023
@michaelklishin michaelklishin added this to the 3.11.24 milestone Sep 27, 2023
michaelklishin and others added 2 commits September 26, 2023 23:19
The Google group has served us well for over nine years
but now some members of the team would like to retire
it and focus on GitHub Discussions.

Slack is not a good fit for OSS projects, and its self-invite
mechanism breaks every few months. Discord has been the
recommended chat-oriented community for a few months now [1].

1. https://blog.rabbitmq.com/posts/2023/04/announcing-rabbitmq-community-discord-server/

(cherry picked from commit dfe390f)
@mergify mergify bot added the bazel label Sep 27, 2023
@michaelklishin michaelklishin merged commit 41694bf into v3.11.x Sep 27, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-9548 branch September 27, 2023 04:42
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