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

Merge release 0.16 to master #7663

Merged

Conversation

Projects
None yet
5 participants
@brendandburns
Copy link
Contributor

brendandburns commented May 1, 2015

@zmerlynn @jlowdermilk

Prashanth Balasubramanian and others added some commits Apr 29, 2015

Fix rollingupdate --image
(cherry picked from commit c8ea0c2)

Conflicts:
	docs/kubectl.md
	pkg/kubectl/cmd/rollingupdate.go
fix kube-down for provider gke
(cherry picked from commit 996168d)
Fix the fix for GKE kube-down
Fixes issue in #7565

(cherry picked from commit 6a0fab3)

@googlebot googlebot added the cla: yes label May 1, 2015

@zmerlynn

This comment has been minimized.

Copy link
Member

zmerlynn commented May 1, 2015

LGTM

@zmerlynn

This comment has been minimized.

Copy link
Member

zmerlynn commented May 1, 2015

cc @eparis .. should be lovely

zmerlynn added a commit that referenced this pull request May 1, 2015

@zmerlynn zmerlynn merged commit 3b637ea into kubernetes:master May 1, 2015

1 of 3 checks passed

Shippable Builds in progress on Shippable
Details
continuous-integration/travis-ci/pr The Travis CI build is in progress
Details
cla/google All necessary CLAs are signed
@eparis

This comment has been minimized.

Copy link
Member

eparis commented May 2, 2015

My stuff looks happy :)

@brendandburns brendandburns deleted the brendandburns:merge-release-0.16-to-master branch Aug 7, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.