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 #40828 #40833

Merged
merged 1 commit into from
Feb 2, 2017
Merged

Automated cherry pick of #40828 #40833

merged 1 commit into from
Feb 2, 2017

Conversation

zmerlynn
Copy link
Member

@zmerlynn zmerlynn commented Feb 2, 2017

Cherry pick of #40828 on release-1.4.

#40828: Bump GCE to container-vm-v20170201

@k8s-reviewable
Copy link

This change is Reviewable

@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 Feb 2, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: zmerlynn

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 2, 2017
@jessfraz jessfraz added this to the v1.4 milestone Feb 2, 2017
@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 2, 2017
@jessfraz
Copy link
Contributor

jessfraz commented Feb 2, 2017

awesome thanks!

@jessfraz jessfraz added lgtm "Looks good to me", indicates that a PR is ready to be merged. cla: human-approved labels Feb 2, 2017
@k8s-ci-robot
Copy link
Contributor

@zmerlynn: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins CRI GCE Node e2e d008fc6 link @k8s-bot cri node e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@jessfraz
Copy link
Contributor

jessfraz commented Feb 2, 2017

all green merging

@jessfraz jessfraz merged commit 34758dc into kubernetes:release-1.4 Feb 2, 2017
@jessfraz
Copy link
Contributor

jessfraz commented Feb 2, 2017

the failure is for a test that shouldnt be running on 1.4 anyways :)

@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@saad-ali saad-ali mentioned this pull request Feb 11, 2017
Closed
jessfraz added a commit to jessfraz/kubernetes that referenced this pull request Feb 14, 2017
@jessfraz
Revert "Merge pull request kubernetes#40833 from zmerlynn/automated-c…
834d131 
…herry-pick-of-#40828-upstream-release-1.4"

This reverts commit 34758dc, reversing
changes made to c69582d.
@jessfraz jessfraz mentioned this pull request Feb 14, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jessfraz jessfraz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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.4
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@zmerlynn @k8s-reviewable @k8s-github-robot @jessfraz @k8s-ci-robot @k8s-cherrypick-bot