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

Manual cherry-pick of #50636 #50642

Merged
merged 1 commit into from
Aug 15, 2017
Merged

Manual cherry-pick of #50636 #50642

merged 1 commit into from
Aug 15, 2017

Conversation

piosz
Copy link
Member

@piosz piosz commented Aug 14, 2017 •
edited
Loading

#50636: Bumped Heapster version to 1.4.1

Bumped Heapster version to 1.4.1:
- handle gracefully problem when kubelet reports duplicated stats for the same container (see #47853) on Heapster side
- fixed bugs and improved performance in Stackdriver Sink

@piosz piosz added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Aug 14, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 14, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 14, 2017
@piosz piosz added this to the v1.7 milestone Aug 14, 2017
@piosz
Copy link
Member Author

piosz commented Aug 15, 2017

/test pull-kubernetes-e2e-gce-etcd3

1 similar comment
@piosz
Copy link
Member Author

piosz commented Aug 15, 2017

/test pull-kubernetes-e2e-gce-etcd3

@crassirostris
Copy link

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 15, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crassirostris, piosz

Associated issue: 50636

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

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

@wojtek-t
Copy link
Member

@piosz @crassirostris - what problem is that fixing?

@crassirostris
Copy link

+1, I think the release note should include the description of the changes

@crassirostris
Copy link

Both in the original PR and in the cherry-pick

@piosz
Copy link
Member Author

piosz commented Aug 15, 2017

@wojtek-t improved release notes. PTAL
@crassirostris it doesn't make sense to have release notes in master, because we will have Heapster 1.5 there.

@crassirostris
Copy link

@crassirostris it doesn't make sense to have release notes in master, because we will have Heapster 1.5 there.

OK. Then IMHO it didn't make sense to create a PR in the head at all

@piosz
Copy link
Member Author

piosz commented Aug 15, 2017

@crassirostris I did it because some tests are only run on HEAD.

@crassirostris
Copy link

@piosz OK, thanks for the explanation!

@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Aug 15, 2017
@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 1e7e5e6 into kubernetes:release-1.7 Aug 15, 2017
@piosz piosz deleted the heap-cherry branch August 16, 2017 11:36
@lachie83 lachie83 mentioned this pull request Aug 17, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@crassirostris crassirostris

@wojtek-t wojtek-t

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.
5 participants
@piosz @crassirostris @k8s-github-robot @wojtek-t @k8s-ci-robot