Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented May 6, 2024

and not oauth2_client or the OAuth 2 plugin.

In follow-up to #10645.

Pair: @pjk25


This is an automatic backport of pull request #11177 done by [Mergify](https://mergify.com).

and not oauth2_client or the OAuth 2 plugin.

Pair: Rin Kuryloski
(cherry picked from commit ef38882)

# Conflicts:
#	rabbitmq-components.mk
@mergify mergify bot added the conflicts label May 6, 2024
@mergify
Copy link
Author

mergify bot commented May 6, 2024

Cherry-pick of ef38882 has failed:

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

You are currently cherry-picking commit ef3888220a.
  (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/Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rabbitmq-components.mk

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the make label May 6, 2024
@michaelklishin
Copy link
Collaborator

@Mergifyio rebase

@mergify
Copy link
Author

mergify bot commented May 6, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]
  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

@mergify mergify bot deleted the mergify/bp/v3.13.x/pr-11177 branch May 6, 2024 16:34
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