Automated cherry pick of #30814 #31019
Merged
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
k8s-github-robot
added
cherry-pick-approved
|
The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks) |
freehan
force-pushed
the
automated-cherry-pick-of-#30814-upstream-release-1.3
branch
from
9aa4071 to
dac3726
Compare
| func addDefaultingFuncs(scheme *runtime.Scheme) { | ||
| scheme.AddDefaultingFuncs( | ||
| const ( | ||
| defaultRootDir = "/var/lib/kubelet" |
There was a problem hiding this comment.
There is a lot here that is not part of this PR
|
A bunch of merge artifact made it through, otherwise LGTM |
thockin
added
release-note-none
freehan
force-pushed
the
automated-cherry-pick-of-#30814-upstream-release-1.3
branch
from
c09ae79 to
9db4175
Compare
k8s-github-robot
added
size/L
freehan
force-pushed
the
automated-cherry-pick-of-#30814-upstream-release-1.3
branch
from
9db4175 to
1240f79
Compare
thockin
added
the
lgtm
fabioy
added
release-note
|
@freehan This failed boilerplate checks. Can you fix them? Thanks. |
freehan
force-pushed
the
automated-cherry-pick-of-#30814-upstream-release-1.3
branch
from
1240f79 to
f5e0d1a
Compare
|
boilerplate fixed. |
thockin
added
lgtm
|
@k8s-bot test this issue: #IGNORE |
|
GCE e2e build/test passed for commit f5e0d1a. |
shyamjvs
pushed a commit
to shyamjvs/kubernetes
that referenced
this pull request
Dec 1, 2016
…k-of-#30814-upstream-release-1.3 Automated cherry pick of kubernetes#30814
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Cherry pick of #30814 on release-1.3.
This change is