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 #41658 upstream release 1.5 #41825

Merged
merged 1 commit into from Feb 22, 2017
Merged

Automated cherry pick of #41658 upstream release 1.5 #41825

merged 1 commit into from Feb 22, 2017

Conversation

janetkuo
Copy link
Member

Automated cherry pick of #41658 upstream release 1.5

@soltysh @mwielgus

@janetkuo janetkuo added cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. labels Feb 21, 2017
@janetkuo janetkuo added this to the v1.5 milestone Feb 21, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 21, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: janetkuo

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

@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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 21, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@soltysh
Copy link
Contributor

soltysh commented Feb 21, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 21, 2017
@soltysh soltysh removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 21, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 21, 2017
@soltysh
Copy link
Contributor

soltysh commented Feb 21, 2017

Adding cherry-pick approved label to satisfy bot, since the original PR has one.

@soltysh soltysh 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 Feb 21, 2017
@mwielgus
Copy link
Contributor

@soltysh
I'm ok with this PR but in general you should rather not merge anything to a patch release without lgtm/approval from the patch release manager.

@soltysh
Copy link
Contributor

soltysh commented Feb 21, 2017

@mwielgus sorry, but looking at the original PR it already had approval from @saad-ali

@soltysh soltysh removed the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 21, 2017
@mwielgus mwielgus added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 21, 2017
@mwielgus
Copy link
Contributor

Anyway - thank you and @janetkuo for the fix.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 307530b into kubernetes:release-1.5 Feb 22, 2017
@k8s-cherrypick-bot
Copy link

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

This was referenced Sep 11, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@soltysh soltysh

@mwielgus mwielgus

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-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@janetkuo @k8s-github-robot @k8s-reviewable @soltysh @mwielgus @k8s-cherrypick-bot @k8s-ci-robot