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

Fix working_set calculation in kubelet #29154

Merged
merged 1 commit into from
Jul 20, 2016

Conversation

vishh
Copy link
Contributor

@vishh vishh commented Jul 19, 2016

Update cadvisor to v0.23.7

Fixes #28619

Note that this PR is not a typical cherry-pick because master branch has diverged from release-1.3 branch and can no longer compile against cadvisor's release-0.23 branch which was created specifically for k8s release-1.3 branch.

Signed-off-by: Vishnu kannan <vishnuk@google.com>
@vishh vishh added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jul 19, 2016
@vishh vishh added this to the v1.3 milestone Jul 19, 2016
@vishh
Copy link
Contributor Author

vishh commented Jul 19, 2016

cc @roberthbailey this is not a typical cherry-pick FYI.

@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 19, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 19, 2016

GCE e2e build/test passed for commit 3392bdf.

@roberthbailey
Copy link
Contributor

Can you cross link the PR into master that this would have cherry picked (had it been possible)? Or was there no equivalent change in the master branch?

@fabioy
Copy link
Contributor

fabioy commented Jul 19, 2016

PR for master branch: #29153

@fabioy
Copy link
Contributor

fabioy commented Jul 20, 2016

I'll approve this cherrypick, but won't LGTM it until #29153 is merged into master. Thanks.

@fabioy fabioy added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jul 20, 2016
@vishh
Copy link
Contributor Author

vishh commented Jul 20, 2016

Update: The master branch PR #29153 is LGTM'ed. Waiting on the merge queue now!

@vishh
Copy link
Contributor Author

vishh commented Jul 20, 2016

@fabioy Master branch PR is not merged

@fabioy fabioy 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 Jul 20, 2016
@fabioy fabioy merged commit 6cf50ee into kubernetes:release-1.3 Jul 20, 2016
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Fix working_set calculation in kubelet
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.

7 participants