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

Trusty: Do not create the docker-daemon cgroup #23996

Merged
merged 1 commit into from
Apr 8, 2016
Merged

Trusty: Do not create the docker-daemon cgroup #23996

merged 1 commit into from
Apr 8, 2016

Conversation

andyzheng0831
Copy link

This is a part of fix for issue #23956. But only when #23961 is also fixed, the Jenkins testing on our image will be green.

@dchen1107 @vishh please review this. Please also add "release note" and "cherrypick-candidate" labels, and mark it as milestone 1.2, as we also need to add this correct logic in 1.2 releases.

cc/ @wonderfly @roberthbailey @fabioy FYI.

@andyzheng0831
Copy link
Author

Reviewers, I have run e2e for this change, and tests are all green

Ran 163 of 274 Specs in 4494.018 seconds
SUCCESS! -- 163 Passed | 0 Failed | 0 Pending | 111 Skipped PASS

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels Apr 7, 2016
@dchen1107 dchen1107 assigned dchen1107 and unassigned davidopp Apr 7, 2016
@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added lgtm "Looks good to me", indicates that a PR is ready to be merged. cherrypick-candidate labels Apr 7, 2016
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@andyzheng0831
Copy link
Author

@dchen1107 I think we also need "release-note" label because I was told that every PR to be cherry picked needs such a label. The default release note for this PR is its title, which I think is accurate.

@k8s-github-robot
Copy link

Removing LGTM because the release note process has not been followed.
One of the following labels is required "release-note", "release-note-none", or "release-note-action-required"
Please see: https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/release-notes.md

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 7, 2016
@dchen1107 dchen1107 added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Apr 7, 2016
@dchen1107
Copy link
Member

There is no need to block current patch release: 1.2.2. We can include this one and a fix to test itself to next patch release. cc/ @roberthbailey @bgrant0607

@roberthbailey
Copy link
Contributor

@andyzheng0831 - looks like a test failed (likely flaky). Can you investigate and poke the bot?

@k8s-bot
Copy link

k8s-bot commented Apr 7, 2016

GCE e2e build/test passed for commit b1e18f3.

@andyzheng0831
Copy link
Author

The build failure: No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.

I did some search and noticed that this happened before.

@k8s-bot unit test this issue: #IGNORE

@vishh
Copy link
Contributor

vishh commented Apr 7, 2016

LGTM

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Apr 8, 2016

GCE e2e build/test passed for commit b1e18f3.

@j3ffml j3ffml merged commit d8f42f8 into kubernetes:master Apr 8, 2016
@zmerlynn zmerlynn added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 13, 2016
k8s-github-robot pushed a commit that referenced this pull request Apr 13, 2016
…-#23996-upstream-release-1.2

Automatic merge from submit-queue

Automated cherry pick of #23996

Cherry pick of #23996 on release-1.2.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ry-pick-of-#23996-upstream-release-1.2

Automatic merge from submit-queue

Automated cherry pick of kubernetes#23996

Cherry pick of kubernetes#23996 on release-1.2.
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…ry-pick-of-#23996-upstream-release-1.2

Automatic merge from submit-queue

Automated cherry pick of kubernetes#23996

Cherry pick of kubernetes#23996 on release-1.2.
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet