Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jun 6, 2024

As of [1], this field has become irrelevant or even misleading.

  1. https://www.rabbitmq.com/blog/2024/05/31/new-community-support-policy

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

As of [1], this field has become irrelevant or even
misleading.

1. https://www.rabbitmq.com/blog/2024/05/31/new-community-support-policy

(cherry picked from commit 41e5d38)
(cherry picked from commit 53c67ce)

# Conflicts:
#	deps/rabbit/src/rabbit.erl
#	deps/rabbit/src/rabbit_release_series.erl
@mergify mergify bot added the conflicts label Jun 6, 2024
@mergify
Copy link
Author

mergify bot commented Jun 6, 2024

Cherry-pick of 53c67ce has failed:

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

You are currently cherry-picking commit 53c67ce45b.
  (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_cli/lib/rabbitmq/cli/ctl/commands/status_command.ex

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

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 merged commit 81e1214 into v3.12.x Jun 6, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-11387 branch June 6, 2024 23:19
@michaelklishin michaelklishin added this to the 3.12.15 milestone Jun 6, 2024
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