Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 14, 2023

This is an automatic backport of pull request #7280 done by Mergify.
Cherry-pick of 12ec3a5 has failed:

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

You are currently cherry-picking commit 12ec3a55ff.
  (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/test/test_rabbit_event_handler.erl
	modified:   deps/rabbit/test/vhost_SUITE.erl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   deps/rabbit/src/rabbit_db_vhost.erl
	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 4 commits February 14, 2023 09:46
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
now that the server sorts and deduplicates them

(cherry picked from commit 9beda74)
(cherry picked from commit 0476d10)
@HoloRin
Copy link
Contributor

HoloRin commented Feb 14, 2023

@michaelklishin maybe this should not actually be backported, unless the rabbit_db_* PRs will be backported as well?

@HoloRin
Copy link
Contributor

HoloRin commented Feb 14, 2023

On second though, I'll fixup the merge

@HoloRin HoloRin marked this pull request as draft February 14, 2023 10:39
@HoloRin HoloRin marked this pull request as ready for review February 14, 2023 12:40
@michaelklishin
Copy link
Collaborator

@pjk25 I have asked for rabbit_db_* to be backported partially to make backports of other PRs easier.

@michaelklishin michaelklishin merged commit 0784b02 into v3.11.x Feb 14, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-7280 branch February 14, 2023 16:30
HoloRin added a commit that referenced this pull request Feb 15, 2023
rabbit_vhost:set_tags/2 avoids notifying if tags are unchanged (backport #7280) (backport #7282)
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