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

redis: fix merge race #7943

Merged
merged 1 commit into from
Aug 16, 2019
Merged

Conversation

lizan
Copy link
Member

@lizan lizan commented Aug 15, 2019

Signed-off-by: Lizan Zhou lizan@tetrate.io

Description:
Fix merge race of #7496 and #7922

Risk Level:
Testing:
Docs Changes:
Release Notes:

Signed-off-by: Lizan Zhou <lizan@tetrate.io>
Copy link
Member

@mattklein123 mattklein123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, just saw this myself.

@mattklein123 mattklein123 merged commit 5a7bab7 into envoyproxy:master Aug 16, 2019
@lizan lizan deleted the redis_merge_fix branch August 16, 2019 00:07
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.

2 participants