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 #37489 #37321 #37394 #37345 #37397 #37411 #37379 #37323 #37195 #37139 #37225 #37562 #37487 upstream release 1.5 #37670

Merged
merged 13 commits into from
Nov 30, 2016
Merged

Automated cherry pick of #37489 #37321 #37394 #37345 #37397 #37411 #37379 #37323 #37195 #37139 #37225 #37562 #37487 upstream release 1.5 #37670

merged 13 commits into from
Nov 30, 2016

Conversation

saad-ali
Copy link
Member

Batch cherry pick PRs #37489 #37321 #37394 #37345 #37397 #37411 #37379 #37323 #37195 #37139 #37225 #37562 #37487 from master to release-1.5 branch.

#37379 and #37225 had merge conflicts that needed to be resolved (due to large PRs that merged to master but not 1.5, see this for details)

CC PR Authors: @mwielgus @ymqytw @nikhiljindal @MrHohn @ymqytw @wojtek-t @thockin @roberthbailey

@saad-ali saad-ali added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 30, 2016
@saad-ali saad-ali added this to the v1.5 milestone Nov 30, 2016
@saad-ali saad-ali self-assigned this Nov 30, 2016
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 30, 2016
@k8s-oncall
Copy link

This change is Reviewable

@thockin
Copy link
Member

thockin commented Nov 30, 2016

LGTM

@saad-ali saad-ali added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit fa4af60. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Nov 30, 2016
@saad-ali saad-ali added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Nov 30, 2016
@saad-ali
Copy link
Member Author

@k8s-bot cvm gke e2e test this

1 similar comment
@saad-ali
Copy link
Member Author

@k8s-bot cvm gke e2e test this

@saad-ali
Copy link
Member Author

All checks are green. Manually merging to let CI run overnight with new fixes on release-1.5 branch.

Jenkins CRI GCE Node e2e — Build succeeded.
Jenkins GCE Node e2e — Build succeeded.
Jenkins GCE e2e — Build succeeded.
Jenkins GCE etcd3 e2e — Build succeeded.
Jenkins GCI GKE smoke e2e — Build succeeded.
Jenkins GKE smoke e2e — Build succeeded.
Jenkins Kubemark GCE e2e — Build succeeded.
Jenkins unit/integration — Build succeeded.

@saad-ali saad-ali merged commit 96a69ce into kubernetes:release-1.5 Nov 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@saad-ali saad-ali

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.
10 participants
@saad-ali @k8s-oncall @thockin @k8s-ci-robot @k8s-github-robot @mwielgus @nikhiljindal @MrHohn @wojtek-t @roberthbailey