Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Aug 7, 2025

Proposed Changes

A plugin wide formatting - no changes to the code other than formatting.

Types of Changes

What types of changes does your code introduce to this project?
Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes issue #NNNN)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause an observable behavior change in existing systems)
  • Documentation improvements (corrections, new content, etc)
  • Cosmetic change (whitespace, formatting, etc)
  • Build system and/or CI

Checklist

Put an x in the boxes that apply.
You can also fill these out after creating the PR.
If you're unsure about any of them, don't hesitate to ask on the mailing list.
We're here to help!
This is simply a reminder of what we are going to look for before merging your code.

  • I have read the CONTRIBUTING.md document
  • I have signed the CA (see https://cla.pivotal.io/sign/rabbitmq)
  • I have added tests that prove my fix is effective or that my feature works
  • All tests pass locally with my changes
  • If relevant, I have added necessary documentation to https://github.com/rabbitmq/rabbitmq-website
  • If relevant, I have added this change to the first version(s) in release-notes that I expect to introduce it

Further Comments

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution
you did and what alternatives you considered, etc.


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

(cherry picked from commit a4fffbd)

# Conflicts:
#	deps/rabbitmq_aws/src/rabbitmq_aws.erl
#	deps/rabbitmq_aws/src/rabbitmq_aws_config.erl
(cherry picked from commit 289acdb)
@mergify mergify bot added the conflicts label Aug 7, 2025
@mergify
Copy link
Author

mergify bot commented Aug 7, 2025

Cherry-pick of a4fffbd has failed:

On branch mergify/bp/v4.1.x/pr-14315
Your branch is up to date with 'origin/v4.1.x'.

You are currently cherry-picking commit a4fffbd7e.
  (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_aws/include/rabbitmq_aws.hrl
	modified:   deps/rabbitmq_aws/src/rabbitmq_aws_app.erl
	modified:   deps/rabbitmq_aws/src/rabbitmq_aws_json.erl
	modified:   deps/rabbitmq_aws/src/rabbitmq_aws_sign.erl
	modified:   deps/rabbitmq_aws/src/rabbitmq_aws_sup.erl
	modified:   deps/rabbitmq_aws/src/rabbitmq_aws_urilib.erl
	modified:   deps/rabbitmq_aws/src/rabbitmq_aws_xml.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_all_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_app_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_config_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_json_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_sign_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_sup_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_urilib_tests.erl
	modified:   deps/rabbitmq_aws/test/rabbitmq_aws_xml_tests.erl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   deps/rabbitmq_aws/src/rabbitmq_aws.erl
	both modified:   deps/rabbitmq_aws/src/rabbitmq_aws_config.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 deleted the mergify/bp/v4.1.x/pr-14315 branch August 7, 2025 01:24
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