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 #41933 upstream release 1.5 #41948

Merged
merged 1 commit into from
Feb 23, 2017
Merged

Automated cherry pick of #41933 upstream release 1.5 #41948

merged 1 commit into from
Feb 23, 2017

Conversation

saad-ali
Copy link
Member

Automated cherry pick of PR #41933 ("Don't fail if the grep fails to match any resources") upstream release 1.5

Fixes broken CI (e.g. https://k8s-gubernator.appspot.com/builds/kubernetes-jenkins/logs/ci-kubernetes-e2e-gke-release-1.5)

CC @mwielgus

@saad-ali saad-ali added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note-none Denotes a PR that doesn't merit a release note. labels Feb 23, 2017
@saad-ali saad-ali added this to the v1.5 milestone Feb 23, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 23, 2017
@ixdy
Copy link
Member

ixdy commented Feb 23, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 23, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: saad-ali

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

We suggest the following people:
cc @jszczepkowski
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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 23, 2017
@saad-ali
Copy link
Member Author

15 checks succeeded. Manually merging to unblock 1.5 branch.

Jenkins Bazel Build — Skipped
Jenkins Cross Build — Build succeeded.
Jenkins GCE Node e2e — Build succeeded.
Jenkins GCE e2e — Build succeeded.
Jenkins GCE etcd3 e2e — Build succeeded.
Jenkins GCI GCE e2e — Build succeeded.
Jenkins GCI GKE smoke e2e — Build succeeded.
Jenkins GKE smoke e2e — Build succeeded.
Jenkins Kubemark GCE e2e — Build succeeded.
Jenkins kops AWS e2e — Build succeeded.
Jenkins non-CRI GCE Node e2e — Build succeeded.
Jenkins non-CRI GCE e2e — Skipped
Jenkins unit/integration — Build succeeded.
Jenkins verification — Build succeeded.

@saad-ali saad-ali merged commit 1f6bd7e into kubernetes:release-1.5 Feb 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@krzyzacy krzyzacy

@ixdy ixdy

@mwielgus mwielgus

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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.5
Development

Successfully merging this pull request may close these issues.
7 participants
@saad-ali @ixdy @k8s-reviewable @k8s-github-robot @krzyzacy @mwielgus @k8s-ci-robot