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

Fixes #8547 (backport #8548) (backport #8566) #8572

Merged
merged 2 commits into from
Jun 14, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 14, 2023

This is an automatic backport of pull request #8566 done by Mergify.
Cherry-pick of 85be083 has failed:

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

You are currently cherry-picking commit 85be083aff.
  (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/rabbitmq_auth_backend_oauth2/src/uaa_jwks.erl
	modified:   deps/rabbitmq_auth_backend_oauth2/src/uaa_jwt.erl
	modified:   deps/rabbitmq_auth_backend_oauth2/test/unit_SUITE.erl
	modified:   deps/rabbitmq_management/selenium/bin/suite_template
	modified:   deps/rabbitmq_management/selenium/package.json
	modified:   deps/rabbitmq_management/selenium/suites/oauth-with-keycloak.sh
	modified:   deps/rabbitmq_management/selenium/test/oauth/.env.docker.keycloak
	modified:   deps/rabbitmq_management/selenium/test/oauth/.env.local.keycloak
	new file:   deps/rabbitmq_management/selenium/test/oauth/keycloak/ca_certificate.pem
	new file:   deps/rabbitmq_management/selenium/test/oauth/keycloak/server_localhost_certificate.pem
	new file:   deps/rabbitmq_management/selenium/test/oauth/keycloak/server_localhost_key.pem
	modified:   deps/rabbitmq_management/selenium/test/oauth/rabbitmq.conf
	new file:   deps/rabbitmq_management/selenium/test/oauth/rabbitmq.jwks.conf
	modified:   deps/rabbitmq_management/selenium/test/oauth/rabbitmq.uaa.conf
	modified:   deps/rabbitmq_management/selenium/test/utils.js

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_access_control.erl

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 77ee572)
(cherry picked from commit 85be083)

# Conflicts:
#	deps/rabbit/src/rabbit_access_control.erl
@mergify mergify bot added the conflicts label Jun 14, 2023
@michaelklishin michaelklishin added this to the 3.11.19 milestone Jun 14, 2023
@michaelklishin michaelklishin merged commit 8f39150 into v3.11.x Jun 14, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-8566 branch June 14, 2023 18:27
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