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 #23724 #23937

Merged
merged 1 commit into from
Apr 6, 2016
Merged

Automated cherry pick of #23724 #23937

merged 1 commit into from
Apr 6, 2016

Conversation

zmerlynn
Copy link
Member

@zmerlynn zmerlynn commented Apr 6, 2016

Cherry pick of #23724 on release-1.2.

@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.

@roberthbailey roberthbailey self-assigned this Apr 6, 2016
@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2016
@k8s-github-robot k8s-github-robot added this to the v1.2 milestone Apr 6, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Apr 6, 2016
@k8s-github-robot
Copy link

Removing LGTM because the release note process has not been followed.
One of the following labels is required "release-note", "release-note-none", or "release-note-action-required"
Please see: https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/release-notes.md

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 6, 2016
@zmerlynn zmerlynn added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Apr 6, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 6, 2016

GCE e2e build/test passed for commit e7224e3.

@zmerlynn zmerlynn merged commit 05ff51b into kubernetes:release-1.2 Apr 6, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@zmerlynn
Merge pull request kubernetes#23937 from zmerlynn/automated-cherry-pi…
adac35c 
…ck-of-#23724-upstream-release-1.2

Automated cherry pick of kubernetes#23724
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@zmerlynn
Merge pull request kubernetes#23937 from zmerlynn/automated-cherry-pi…
d1b9882 
…ck-of-#23724-upstream-release-1.2

Automated cherry pick of kubernetes#23724
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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
6 participants
@zmerlynn @googlebot @k8s-github-robot @k8s-bot @k8s-teamcity-mesosphere @roberthbailey