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

Automated cherry pick of #31189 #31704 #32831 #32907 #33003 #33349 #31190 #33581 #34089 #34234 #32822 #33393 #34246 #34435 #32477 upstream release 1.4 #35205

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Oct 20, 2016

We are going to release etcd v3 in 1.4.x release.

Cherrypick etcd v3-related bug fixes to 1.4 branch

Those PRs include:

Automated cherry pick of #31189 #31704 #32831 #32907 #33003 #33349 #31190 #33581 #34089 #34234 #32822 #33393 #34246 #34435 #32477

@hongchaodeng @xiang90 @lavalamp @smarterclayton


This change is Reviewable

@wojtek-t wojtek-t added cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. labels Oct 20, 2016
@wojtek-t wojtek-t added this to the v1.4 milestone Oct 20, 2016
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Oct 20, 2016
@jessfraz
Copy link
Contributor

we are going to do this one in it's own release right? so we should wait to merge

@wojtek-t
Copy link
Member Author

OK - all tests are passing now;

@mml @timothysc @jessfraz - can you please take a look?

@jessfraz
Copy link
Contributor

these are the bits for etcd that can be merged now?

@jessfraz jessfraz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 20, 2016
@wojtek-t
Copy link
Member Author

these are the bits for etcd that can be merged now?

Yes - this should not affect production at all (this is updating only Godeps for etcd (which are used only in tests) and etcd3 code (which is not used in 1.4 release).

@jessfraz
Copy link
Contributor

thanks for confirming! I'll let @mml and @timothysc do the honors but looks good to me

@jessfraz jessfraz removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Oct 20, 2016
@mml
Copy link
Contributor

mml commented Oct 20, 2016

Not sure exactly what a cherrypick code review should entail. The original code was carefully reviewed. Without reading all 17 PRs, all I can say is that the tests pass, so LGTM.

@jessfraz jessfraz added lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Oct 20, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit bdbe2e1 into kubernetes:release-1.4 Oct 21, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@wojtek-t wojtek-t deleted the automated-cherry-pick-of-#31189-#31704-#32831-#32907-#33003-#33349-#31190-#33581-#34089-#34234-#32822-#33393-#34246-#34435-#32477-upstream-release-1.4 branch November 18, 2016 13:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants