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.

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

Automated cherry pick of #37287 #37604 #37353 #37290 #37572 #37684 #37671 upstream release 1.5 #37778

Conversation

saad-ali
Copy link
Member

@saad-ali saad-ali commented Dec 1, 2016

Batch cherry pick PRs #37287 #37604 #37353 #37290 #37572 #37684 #37671 from master to release-1.5 branch.

None had merge conflicts that needed to be resolved

CC PR Authors: @bryk @ymqytw @nikhiljindal @mwielgus @rf232 @mtaufen

bryk and others added 7 commits November 30, 2016 21:05
There will be one more such PR coming for 1.5 release. In one week.

Github release info:
https://github.com/kubernetes/dashboard/releases/tag/v1.5.0-beta1
Collect logs via journalctl if journalctl is installed, rather than only if
kubelet.service is running. The old way resulted in us losing logs any
time the kubelet was failing. This, of course, breaks on a node if
someone decided to install journalctl but not use it. But that is not
the case on any of the images used by cluster-level tests at present.
@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 Dec 1, 2016
@saad-ali saad-ali added this to the v1.5 milestone Dec 1, 2016
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 1, 2016
@k8s-oncall
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 1, 2016
@saad-ali
Copy link
Member Author

saad-ali commented Dec 1, 2016

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 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 unit/integration — Build succeeded.
Jenkins verification — Build succeeded.

@saad-ali saad-ali merged commit 5c6c03c into kubernetes:release-1.5 Dec 1, 2016
@thockin
Copy link
Member

thockin commented Dec 1, 2016 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. 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
Development

Successfully merging this pull request may close these issues.

10 participants