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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #2151: security: tikv encryption kms config #2198

Merged
merged 5 commits into from
Apr 16, 2020
Merged

Automated cherry pick of #2151: security: tikv encryption kms config #2198

merged 5 commits into from
Apr 16, 2020

Conversation

cofyc
Copy link
Contributor

@cofyc cofyc commented Apr 15, 2020

Cherry pick of #2151 on release-1.1.

#2151: security: tikv encryption kms config

@cofyc cofyc requested a review from shuijing198799 April 15, 2020 09:41
shuijing198799
shuijing198799 previously approved these changes Apr 15, 2020
View reviewed changes
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

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

LGTM

@shuijing198799
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor

sre-bot commented Apr 15, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 15, 2020

@cofyc merge failed.

@cofyc cofyc force-pushed the automated-cherry-pick-of-#2151-upstream-release-1.1 branch from c910373 to 82ab65d Compare April 15, 2020 10:50
@cofyc cofyc requested a review from shuijing198799 April 15, 2020 11:03
@cofyc
Copy link
Contributor Author

cofyc commented Apr 15, 2020

@shuijing198799 fixed the generated file, PTAL

shuijing198799
shuijing198799 approved these changes Apr 16, 2020
View reviewed changes
Copy link
Contributor

@shuijing198799 shuijing198799 left a comment

Choose a reason for hiding this comment

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

LGTM

@cofyc cofyc merged commit 2b641cb into pingcap:release-1.1 Apr 16, 2020
@cofyc cofyc mentioned this pull request Apr 28, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@shuijing198799 shuijing198799 shuijing198799 approved these changes

Assignees
No one assigned
Labels
CanMerge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cofyc @shuijing198799 @sre-bot