Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 14, 2023

This is an automatic backport of pull request #7282 done by Mergify.
Cherry-pick of bb65d2a has failed:

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

You are currently cherry-picking commit bb65d2af48.
  (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/BUILD.bazel
	new file:   deps/rabbit/src/rabbit_db_vhost.erl
	modified:   deps/rabbit/src/rabbit_vhost.erl
	new file:   deps/rabbit/test/test_rabbit_event_handler.erl

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

Cherry-pick of 81fbaba has failed:

On branch mergify/bp/v3.10.x/pr-7282
Your branch is ahead of 'origin/v3.10.x' by 4 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 81fbaba2e9.
  (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:
	deleted:    deps/rabbit/src/rabbit_db_vhost.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_vhost.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

HoloRin and others added 5 commits February 14, 2023 16:30
Additionally, tags are now always sorted when set

(cherry picked from commit 12ec3a5)

# Conflicts:
#	deps/rabbit/src/rabbit_db_vhost.erl
#	deps/rabbit/src/rabbit_vhost.erl
(cherry picked from commit bb65d2a)

# Conflicts:
#	deps/rabbit/test/vhost_SUITE.erl
(cherry picked from commit f87a551)
(cherry picked from commit 1633033)
now that the server sorts and deduplicates them

(cherry picked from commit 9beda74)
(cherry picked from commit a4d43d8)
(cherry picked from commit 0476d10)
(cherry picked from commit c9bfb4f)
(cherry picked from commit 81fbaba)

# Conflicts:
#	deps/rabbit/src/rabbit_vhost.erl
@HoloRin HoloRin marked this pull request as draft February 14, 2023 16:50
@michaelklishin
Copy link
Collaborator

@pjk25 I have pushed a fix, please take a look.

@HoloRin HoloRin marked this pull request as ready for review February 15, 2023 08:47
@HoloRin HoloRin merged commit 132d594 into v3.10.x Feb 15, 2023
@mergify mergify bot deleted the mergify/bp/v3.10.x/pr-7282 branch February 15, 2023 08:47
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.

3 participants