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

Support authentication and SSL for redis sentinel (backport #1376) #1397

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 19, 2024

This change allows enabling SSL and/or authentication for redis sentinel. Previously both of these were possible for only redis, and connections to redis sentinel servers were not protected.


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

This change allows enabling SSL and/or authentication for redis
sentinel. Previously both of these were possible for only redis, and
connections to redis sentinel servers were not protected.

(cherry picked from commit 20e5964)

# Conflicts:
#	gnocchi/common/redis.py
@mergify mergify bot added the conflicts label Aug 19, 2024
Copy link
Contributor Author

mergify bot commented Aug 19, 2024

Cherry-pick of 20e5964 has failed:

On branch mergify/bp/stable/4.6/pr-1376
Your branch is up to date with 'origin/stable/4.6'.

You are currently cherry-picking commit 20e59645.
  (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:   gnocchi/common/redis.py

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot deleted the mergify/bp/stable/4.6/pr-1376 branch August 19, 2024 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

2 participants