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

CHANGELOG: update for #12165 , #12264 . #12355

Merged
merged 1 commit into from
Oct 5, 2020
Merged

CHANGELOG: update for #12165 , #12264 . #12355

merged 1 commit into from
Oct 5, 2020

Conversation

cfc4n
Copy link
Contributor

@cfc4n cfc4n commented Sep 30, 2020

CHANGELOG: update for #12165 , #12264 .

Do I need to backport #12165 , #12264 to branch 3.4\3.3 ?

@mitake @spzala @jingyih

@mitake
Copy link
Contributor

mitake commented Oct 1, 2020

@cfc4n yeah I think the changes are valuable to backport to the stable branches. Do you think it's ok @gyuho ?

mitake
mitake approved these changes Oct 1, 2020
View reviewed changes
Copy link
Contributor

@mitake mitake left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@cfc4n
Copy link
Contributor Author

cfc4n commented Oct 2, 2020 •
edited
Loading

@cfc4n yeah I think the changes are valuable to backport to the stable branches. Do you think it's ok @gyuho ?

Thanks for reivew.

I send two cherry-pick PRs to backport to branch 3.4/3.3 about #12264 , but #12165 can't be auto merged, there is a lot of conflict codes in diff list.

I think that I need to send a normal pr for #12165 , And I'll finished it tomorrow.

@mitake
Copy link
Contributor

mitake commented Oct 5, 2020

defer to @xiang90 @gyuho, could you take a look?

@spzala
Copy link
Member

spzala commented Oct 5, 2020

Thanks @cfc4n @mitake Merging this, cherry pick PRs are open so we can discuss them separately.

@spzala spzala merged commit 0693e2b into etcd-io:master Oct 5, 2020
@cfc4n cfc4n deleted the changelog_gettoken branch October 9, 2020 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mitake mitake mitake approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

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