Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 26, 2023

This is an automatic backport of pull request #7992 done by Mergify.
Cherry-pick of 330aa8a has failed:

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

You are currently cherry-picking commit 330aa8acab.
  (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:   rabbitmq.bzl

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/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 3e83c97)
(cherry picked from commit 330aa8a)

# Conflicts:
#	rabbitmq.bzl
@HoloRin HoloRin merged commit 505c7ae into v3.11.x Apr 26, 2023
@HoloRin HoloRin deleted the mergify/bp/v3.11.x/pr-7992 branch April 26, 2023 09:00
mergify bot added a commit that referenced this pull request Apr 26, 2023
…(backport #7989) (backport #7992) (#7995)

* Simplify the reference to RABBITMQ_RUN in bazel in integration tests

(cherry picked from commit 3e83c97)
(cherry picked from commit 330aa8a)

# Conflicts:
#	rabbitmq.bzl

* Fixup backport

---------

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit 505c7ae)

# Conflicts:
#	rabbitmq.bzl
HoloRin added a commit that referenced this pull request Apr 26, 2023
…(backport #7989) (backport #7992) (backport #7995) (#7998)

* Simplify the reference to RABBITMQ_RUN in bazel in integration tests (backport #7989) (backport #7992) (#7995)

* Simplify the reference to RABBITMQ_RUN in bazel in integration tests

(cherry picked from commit 3e83c97)
(cherry picked from commit 330aa8a)

# Conflicts:
#	rabbitmq.bzl

* Fixup backport

---------

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit 505c7ae)

# Conflicts:
#	rabbitmq.bzl

* Fixup backport

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
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