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 #24987 #24999

Merged
merged 1 commit into from
May 4, 2016
Merged

Automated cherry pick of #24987 #24999

merged 1 commit into from
May 4, 2016

Conversation

andyzheng0831
Copy link

Cherry pick of #24987 on release-1.2.

@k8s-github-robot
Copy link

The 'parent' PR of cherry-picks must have either the "release-note" or "release-note-action-required" label or this PR must follow the release note process.

@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 29, 2016
@andyzheng0831
Copy link
Author

@roberthbailey @dchen1107 @zmerlynn please review this cherry-pick

cc/ @wonderfly @fabioy FYI

@andyzheng0831 andyzheng0831 mentioned this pull request Apr 29, 2016
Merged
@dchen1107 dchen1107 assigned dchen1107 and unassigned eparis Apr 29, 2016
@dchen1107 dchen1107 added ok-to-merge release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Apr 29, 2016
@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 29, 2016
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Apr 29, 2016
@k8s-github-robot k8s-github-robot added this to the v1.2 milestone Apr 30, 2016
@k8s-github-robot k8s-github-robot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 30, 2016
@zmerlynn zmerlynn removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label May 2, 2016
@k8s-github-robot
Copy link

@roberthbailey
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 4, 2016
@roberthbailey
Copy link
Contributor

Thanks mergebot. I was actually just trying to re-run travis, which is known to be flaky (or broken?) on the release branch, and didn't realize I could do it without pestering you.

@eparis
Copy link
Contributor

eparis commented May 4, 2016

travis doesn't respond to @k8s-bot requests. have to actually go to the details link, sign in with your github info, and click the 'restart' button. Or close/reopen.

@roberthbailey
Copy link
Contributor

@eparis I figured that out right after the bot started testing.

@k8s-bot
Copy link

k8s-bot commented May 4, 2016

GCE e2e build/test passed for commit 4ed3df1.

@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 4, 2016
@roberthbailey
Copy link
Contributor

After talking with @spxtr I'm going to ignore the travis failures and manually merge.

@roberthbailey roberthbailey merged commit 0cc1ddf into kubernetes:release-1.2 May 4, 2016
@andyzheng0831 andyzheng0831 deleted the automated-cherry-pick-of-#24987-upstream-release-1.2 branch May 4, 2016 18:49
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#24999 from andyzheng0831/automated-cher…
72793f3 
…ry-pick-of-#24987-upstream-release-1.2

Automated cherry pick of kubernetes#24987
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@roberthbailey
Merge pull request kubernetes#24999 from andyzheng0831/automated-cher…
a3b7c6b 
…ry-pick-of-#24987-upstream-release-1.2

Automated cherry pick of kubernetes#24987
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@roberthbailey roberthbailey

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 Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
8 participants
@andyzheng0831 @k8s-github-robot @dchen1107 @roberthbailey @eparis @k8s-bot @zmerlynn @googlebot