Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 19, 2024

This is #12751 by @Hathoute. I'm re-submitting it so that all Actions can run with access to GH secrets.

Closes #12750.


This is an automatic backport of pull request #12752 done by Mergify.

Hathoute and others added 3 commits November 19, 2024 10:21
(cherry picked from commit 0d799a5)
(cherry picked from commit 0d51ee9)

# Conflicts:
#	deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl
#	deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_schema_SUITE.erl
(cherry picked from commit ed5f29c)
(cherry picked from commit f1ee5b5)

# Conflicts:
#	deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl
(cherry picked from commit 6459111)
(cherry picked from commit c44c515)
Copy link
Author

mergify bot commented Nov 19, 2024

Cherry-pick of 0d51ee9 has failed:

On branch mergify/bp/v4.0.x/pr-12752
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit 0d51ee9ec0.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_schema.erl
	both modified:   deps/rabbitmq_auth_backend_oauth2/test/rabbit_oauth2_schema_SUITE.erl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of f1ee5b5 has failed:

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

You are currently cherry-picking commit f1ee5b551a.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

@michaelklishin michaelklishin added this to the 4.0.4 milestone Nov 19, 2024
@michaelklishin michaelklishin merged commit 63e327f into v4.0.x Nov 19, 2024
192 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-12752 branch November 19, 2024 11:10
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