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 #11980 #12078

Merged
merged 1 commit into from
Jun 26, 2020
Merged

Automated cherry pick of #11980 #12078

merged 1 commit into from
Jun 26, 2020

Conversation

cfc4n
Copy link
Contributor

@cfc4n cfc4n commented Jun 25, 2020

Cherry pick of #11980 on release-3.3.

#11980: auth: Customize simpleTokenTTL settings.

@gyuho gyuho merged commit c88a2c8 into etcd-io:release-3.3 Jun 26, 2020
@spzala spzala mentioned this pull request Jun 27, 2020
Merged
spzala
spzala reviewed Jun 27, 2020
View reviewed changes
Copy link
Member

@spzala spzala left a comment

Choose a reason for hiding this comment

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

@cfc4n I noticed a build error as commented inline. Trying to fix this under #12087

auth/store_test.go
@@ -585,7 +608,11 @@ func TestRecoverFromSnapshot(t *testing.T) {

as.Close()

<<<<<<< HEAD
Copy link
Member

Choose a reason for hiding this comment

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

@cfc4n I noticed this while working on another PR. Trying to fix this under #12087

Copy link
Contributor Author

@cfc4n cfc4n Jul 7, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

Thank you. 😄

@cfc4n cfc4n deleted the automated-cherry-pick-of-#11980-upstream-release-3.3 branch June 28, 2020 04:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spzala spzala spzala left review comments

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cfc4n @spzala @gyuho