Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Oct 25, 2022

This is an automatic backport of pull request #6241 done by Mergify.
Cherry-pick of 6a42c8a has failed:

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

You are currently cherry-picking commit 6a42c8a34a.
  (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/amqp10_client/src/amqp10_client.erl
	modified:   deps/amqp10_client/src/amqp10_client.hrl
	modified:   deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_link_util.erl
	modified:   deps/rabbitmq_amqp1_0/src/rabbit_amqp1_0_session_process.erl
	modified:   deps/rabbitmq_amqp1_0/test/system_SUITE_data/fsharp-tests/Program.fs

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

Some client libraries (QPid) will automatically send a disposition
with the 'modified' outcome in response to a client local message TTL
expiry.

To support this case and others we treat 'modified' the same as
'accepted' and simply ack the message back to the queue.

This change also contains some API extensions to the amqp10_client
to better support sending the various delivery states (outcomes).

(cherry picked from commit 802688a)
(cherry picked from commit 6a42c8a)

# Conflicts:
#	deps/rabbitmq_amqp1_0/test/amqp10_client_SUITE.erl
@mergify mergify bot added the conflicts label Oct 25, 2022
@michaelklishin michaelklishin added this to the 3.10.11 milestone Oct 25, 2022
@michaelklishin michaelklishin merged commit 318e99f into v3.10.x Oct 25, 2022
@michaelklishin michaelklishin deleted the mergify/bp/v3.10.x/pr-6241 branch October 25, 2022 11:44
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