Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce per-channel consumers limit (by @illotum, AWS) (backport #10754) #10755

Merged
merged 5 commits into from Mar 16, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 16, 2024

This is #10749 by @illotum with a small addition from me, submitted as a separate PR for the sake of easier backporting.


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

Alex Valiushko and others added 4 commits March 16, 2024 01:17
(cherry picked from commit d7374cb)

# Conflicts:
#	deps/rabbit/src/rabbit_channel.erl
(cherry picked from commit 72317cc)

# Conflicts:
#	deps/rabbit/src/rabbit_channel.erl
(cherry picked from commit 34b1cf6)
Copy link
Author

mergify bot commented Mar 16, 2024

Cherry-pick of d7374cb has failed:

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

You are currently cherry-picking commit d7374cb244.
  (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/priv/schema/rabbit.schema
	modified:   deps/rabbit/test/config_schema_SUITE_data/rabbit.snippets
	modified:   deps/rabbit/test/per_node_limit_SUITE.erl

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

Cherry-pick of 72317cc has failed:

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

You are currently cherry-picking commit 72317cc1b0.
  (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/priv/schema/rabbit.schema
	modified:   deps/rabbit/test/per_node_limit_SUITE.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbit/src/rabbit_channel.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 67915eb into v3.13.x Mar 16, 2024
19 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.13.x/pr-10754 branch March 16, 2024 03:19
mergify bot pushed a commit that referenced this pull request Mar 16, 2024
(cherry picked from commit 33680a4)
michaelklishin added a commit that referenced this pull request Mar 16, 2024
Introduce per-channel consumers limit (by @illotum, AWS) (backport #10754) (backport #10755)
@dumbbell dumbbell added this to the 3.13.1 milestone Mar 22, 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.

None yet

2 participants