-
Notifications
You must be signed in to change notification settings - Fork 39.7k
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
Merged
saad-ali
merged 7 commits into
kubernetes:release-1.5
from
saad-ali:automated-cherry-pick-of-#37287-#37604-#37353-#37290-#37572-#37684-#37671-upstream-release-1.5
Dec 1, 2016
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
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
k8s-ci-robot
added
cncf-cla: yes
Indicates the PR's author has signed the CNCF CLA.
labels
Dec 1, 2016
k8s-github-robot
added
the
size/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
label
Dec 1, 2016
All checks are green. Manually merging to let CI run overnight with new fixes on release-1.5 branch.
|
LGTM
…On Wed, Nov 30, 2016 at 10:04 PM, Saad Ali ***@***.***> wrote:
Merged #37778 <#37778>.
—
You are receiving this because you were assigned.
Reply to this email directly, view it on GitHub
<#37778 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AFVgVBikM0to86MsLTaplvEMQF6_OIKCks5rDmN6gaJpZM4LBAj8>
.
|
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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