Skip to content

Do not log HTTP[S] listener options (backport #9573) (backport #9574) #9575

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

Merged
merged 3 commits into from
Sep 28, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 28, 2023

This is an automatic backport of pull request #9574 done by Mergify.
Cherry-pick of 84cc3bd has failed:

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

You are currently cherry-picking commit 84cc3bd8d0.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 9ba3c3e has failed:

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

You are currently cherry-picking commit 9ba3c3eb08.
  (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)

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

no changes added to commit (use "git add" and/or "git commit -a")

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

These messages are now of little use.

References [1].

1. https://github.com/rabbitmq/rabbitmq-server/discussions/9569

(cherry picked from commit 48fe9d0)
(cherry picked from commit 84cc3bd)

# Conflicts:
#	deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_sup.erl
(cherry picked from commit 04ecfc9)
(cherry picked from commit 9ba3c3e)

# Conflicts:
#	deps/rabbitmq_web_dispatch/src/rabbit_web_dispatch_sup.erl
@mergify mergify bot added the conflicts label Sep 28, 2023
@michaelklishin michaelklishin added this to the 3.11.24 milestone Sep 28, 2023
@michaelklishin michaelklishin merged commit 3938176 into v3.11.x Sep 28, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.11.x/pr-9574 branch September 28, 2023 16:25
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.

1 participant