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 #26582 #26826

Merged
merged 1 commit into from
Jun 6, 2016
Merged

Automated cherry pick of #26582 #26826

merged 1 commit into from
Jun 6, 2016

Conversation

adityakali
Copy link
Contributor

Cherry pick of #26582 on release-1.2.

@adityakali
pin GCI version to milestone 52
9df4b48 
This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue kubernetes#26455)
in GCI 53 without breaking the 1.2 release branch.
@andyzheng0831 andyzheng0831 added this to the v1.2 milestone Jun 3, 2016
@andyzheng0831 andyzheng0831 added area/os/gci release-note-none Denotes a PR that doesn't merit a release note. labels Jun 3, 2016
@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. labels Jun 3, 2016
@k8s-bot
Copy link

k8s-bot commented Jun 4, 2016

GCE e2e build/test passed for commit 9df4b48.

@roberthbailey roberthbailey added 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. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jun 4, 2016
@roberthbailey roberthbailey merged commit c51fe37 into kubernetes:release-1.2 Jun 6, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#26826 from adityakali/automated-cherry-…
3e8737b 
…pick-of-#26582-kube-release-1.2

Automated cherry pick of kubernetes#26582
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@roberthbailey
Merge pull request kubernetes#26826 from adityakali/automated-cherry-…
124a585 
…pick-of-#26582-kube-release-1.2

Automated cherry pick of kubernetes#26582
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-none Denotes a PR that doesn't merit a release note. 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.
6 participants
@adityakali @k8s-bot @googlebot @roberthbailey @andyzheng0831 @k8s-github-robot