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

fix(kuma-cp): add option to disable sslsni in universal (backport #5318) #5322

Merged
merged 1 commit into from
Nov 15, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 15, 2022

This is an automatic backport of pull request #5318 done by Mergify.
Cherry-pick of bd7c5c6 has failed:

On branch mergify/bp/release-2.0/pr-5318
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit bd7c5c6dc.
  (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:   UPGRADE.md
	modified:   pkg/config/loader_test.go
	modified:   pkg/config/plugins/resources/postgres/config_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/config/plugins/resources/postgres/config.go

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

@mergify mergify bot requested a review from a team as a code owner November 15, 2022 09:58
@mergify mergify bot added the conflicts label Nov 15, 2022
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont force-pushed the mergify/bp/release-2.0/pr-5318 branch from 3b3b1e6 to c4d251c Compare November 15, 2022 10:21
@michaelbeaumont michaelbeaumont merged commit b57e8d8 into release-2.0 Nov 15, 2022
@michaelbeaumont michaelbeaumont deleted the mergify/bp/release-2.0/pr-5318 branch November 15, 2022 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant