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

Backport of #44421 #44513 #44585

Merged
merged 1 commit into from
Apr 21, 2017
Merged

Backport of #44421 #44513 #44585

merged 1 commit into from
Apr 21, 2017

Conversation

mml
Copy link
Contributor

@mml mml commented Apr 17, 2017 •
edited
Loading

Backport of #44421 #44513 on release-1.5.

#44421: Drop leading path of KUBECTL.EXE if it shows up in
#44513: Use regexp instead of substring to do search and replace.

kube-apiserver now drops unneeded path information if an older version of Windows kubectl sends it.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 17, 2017
@mml mml added this to the v1.5 milestone Apr 17, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@mml mml mentioned this pull request Apr 17, 2017
Closed
@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/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Apr 17, 2017
@lavalamp
Copy link
Member

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lavalamp, mml

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 18, 2017
@mml
Copy link
Contributor Author

mml commented Apr 18, 2017

@mwielgus can we get this picked onto 1.5?

@mml mml added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels Apr 19, 2017
@mwielgus mwielgus 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 Apr 21, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 3776d6b into kubernetes:release-1.5 Apr 21, 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.

@mml
Copy link
Contributor Author

mml commented Apr 24, 2017

@mwielgus can we get a 1.5.7 cut with this in it?

@Quentin-M Quentin-M mentioned this pull request Apr 27, 2017
Closed
@mml mml deleted the kubectl-1.5 branch May 11, 2017 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lavalamp lavalamp

@smarterclayton smarterclayton

@thockin thockin

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.5
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@mml @k8s-reviewable @lavalamp @k8s-github-robot @k8s-cherrypick-bot @smarterclayton @thockin @mwielgus @k8s-ci-robot