Skip to content

Conversation

@dashpole
Copy link
Contributor

@dashpole dashpole commented Nov 1, 2017

Issue: #52336
This is to cherrypick google/cadvisor#1770 to the 1.7 branch.
First, I cherrypicked it to the cadvisor v0.26 branch, which is the cadvisor release tied to k8s v1.7.
Now, I need to update the vendored version in 1.7 from 0.26.1 to 0.26.2.

Fix overlay2 container disk metrics for Docker

/assign @wojtek-t @dchen1107

@k8s-ci-robot k8s-ci-robot added 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 1, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Nov 1, 2017
@dchen1107
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 1, 2017
@dchen1107 dchen1107 added this to the v1.7 milestone Nov 1, 2017
@dchen1107 dchen1107 added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Nov 1, 2017
@mwielgus
Copy link
Contributor

mwielgus commented Nov 3, 2017

This one will skip 1.7.10. Please get the approve label.

@mwielgus mwielgus added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Nov 3, 2017
@mwielgus
Copy link
Contributor

mwielgus commented Nov 3, 2017

Temporarily adding do-not-merge label. Feel free to remove it once 1.7.10 is out.

@dashpole
Copy link
Contributor Author

dashpole commented Nov 3, 2017

issue: #52336

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 3, 2017
@dashpole dashpole removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Nov 7, 2017
@dashpole
Copy link
Contributor Author

dashpole commented Nov 7, 2017

removing do not merge since 1.7.10 is out

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@dchen1107
Copy link
Member

/lgtm

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, dchen1107

Associated issue: 52336

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@dashpole
Copy link
Contributor Author

dashpole commented Nov 7, 2017

/retest

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 97163a4 into kubernetes:release-1.7 Nov 7, 2017
@k8s-cherrypick-bot
Copy link

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

@dashpole dashpole deleted the update_cadvisor_godep_v1.7 branch January 2, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. 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.

7 participants