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 #25123 #25152

Merged
merged 1 commit into from
May 5, 2016
Merged

Automated cherry pick of #25123 #25152

merged 1 commit into from
May 5, 2016

Conversation

roberthbailey
Copy link
Contributor

@roberthbailey roberthbailey commented May 4, 2016 •
edited
Loading

Cherry pick of #25123 on release-1.2.

@roberthbailey
Add an entry to the salt config to allow Debian jessie on GCE. As wit…
6d0f51c 
…h the existing Wheezy image on GCE, docker is expected to already be installed in the image.
@roberthbailey roberthbailey changed the title Add an entry to the salt config to allow Debian jessie on GCE. As wit… Automated cherry pick of #25123 May 4, 2016
@k8s-github-robot k8s-github-robot added this to the v1.2 milestone May 4, 2016
@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 4, 2016
@roberthbailey
Copy link
Contributor Author

roberthbailey commented May 5, 2016 •
edited
Loading

@k8s-bot test this issue: #25153

@roberthbailey
Copy link
Contributor Author

@k8s-bot test this issue: #23321

@k8s-bot
Copy link

k8s-bot commented May 5, 2016

GCE e2e build/test passed for commit 6d0f51c.

@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 5, 2016
@roberthbailey roberthbailey merged commit 8b3a984 into kubernetes:release-1.2 May 5, 2016
@roberthbailey roberthbailey deleted the automated-cherry-pick-of-#25123-upstream-release-1.2 branch May 23, 2016 17:44
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#25152 from roberthbailey/automated-cher…
42e3729 
…ry-pick-of-#25123-upstream-release-1.2

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

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

@zmerlynn zmerlynn

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. 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.
5 participants
@roberthbailey @k8s-bot @zmerlynn @googlebot @k8s-github-robot