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 #23593 #23701

Merged
merged 1 commit into from
Mar 31, 2016
Merged

Automated cherry pick of #23593 #23701

merged 1 commit into from
Mar 31, 2016

Conversation

dchen1107
Copy link
Member

Avoid unnecessary docker daemon restart which might cause docker hang: #23556

Master PR: #23593

@k8s-github-robot
Copy link

This PR is not for the master branch but does not have the cherrypick-approved label. Adding the do-not-merge label.

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 31, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 31, 2016

GCE e2e build/test passed for commit 3f0b47e.

@bgrant0607
Copy link
Member

Why is this not an automatic cherrypick PR?

@bgrant0607
Copy link
Member

LGTM. Merging.

@bgrant0607 bgrant0607 added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Mar 31, 2016
@bgrant0607 bgrant0607 merged commit dea8622 into kubernetes:release-1.2 Mar 31, 2016
@david-mcmahon david-mcmahon changed the title Remove unnecessary override of /etc/init.d/docker on containervm image. Automated cherry pick of #23593 Apr 1, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@bgrant0607
Merge pull request kubernetes#23701 from dchen1107/automated-cherry-p…
65ddfdb 
…ick-of-#23593-upstream-release-1.2

Remove unnecessary override of /etc/init.d/docker on containervm image.
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@bgrant0607
Merge pull request kubernetes#23701 from dchen1107/automated-cherry-p…
1ba0171 
…ick-of-#23593-upstream-release-1.2

Remove unnecessary override of /etc/init.d/docker on containervm image.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bgrant0607 bgrant0607

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dchen1107 @k8s-github-robot @k8s-bot @bgrant0607 @k8s-teamcity-mesosphere @googlebot