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 #19847 #19948

Merged
merged 2 commits into from
Jan 22, 2016
Merged

Automated cherry pick of #19847 #19948

merged 2 commits into from
Jan 22, 2016

Conversation

alex-mohr
Copy link
Contributor

Cherry pick of #19847 on release-1.0.

@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jan 21, 2016
@k8s-bot
Copy link

k8s-bot commented Jan 21, 2016

GCE e2e build/test failed for commit 8d01e54.

@alex-mohr
Copy link
Contributor Author

@k8s-bot test this

alex-mohr added a commit that referenced this pull request Jan 22, 2016
…847-upstream-release-1.0

Automated cherry pick of #19847
@alex-mohr alex-mohr merged commit b642f54 into kubernetes:release-1.0 Jan 22, 2016
@k8s-bot
Copy link

k8s-bot commented Jan 22, 2016

GCE e2e build/test failed for commit 8d01e54.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants