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 #44590 #45866

Merged
merged 4 commits into from
May 17, 2017
Merged

Automated cherry pick of #44590 #45866

merged 4 commits into from
May 17, 2017

Conversation

cjcullen
Copy link
Member

Cherry pick of #44590 on release-1.6.

#44590: When changing basic auth creds, just delete the whole

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 16, 2017
@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. labels May 16, 2017
@k8s-github-robot
Copy link

The 'parent' PR of a cherry-pick PR must have one of the "release-note" or "release-note-action-required" labels, or this PR must follow the standard/parent release note labeling requirement. (release-note-experimental must be explicit for cherry-picks)

@gmarek
Copy link
Contributor

gmarek commented May 16, 2017

Ugh.. I guess asking for sqashing commits on cherry pick is considered wrong?
@k8s-bot verify test this

@gmarek
Copy link
Contributor

gmarek commented May 16, 2017

@cjcullen it seems that verify-federation-openapi-spec.sh is really unhappy. Please fix.

@ikehz
Copy link
Contributor

ikehz commented May 16, 2017 

I0515 23:06:47.999] /go/src/k8s.io/kubernetes/api/openapi-spec is out of date. Please run hack/update-openapi-spec.sh

@ikehz
Copy link
Contributor

ikehz commented May 16, 2017

Ugh.. I guess asking for sqashing commits on cherry pick is considered wrong?

Yeah, sorry about that. Still getting reacquainted with the GitHub workflow.

@enisoc enisoc added 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels May 16, 2017
@enisoc
Copy link
Member

enisoc commented May 16, 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 May 16, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cjcullen, enisoc
We suggest the following additional approver: jbeda

Assign the PR to them by writing /assign @jbeda in a comment when ready.

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

@enisoc
Copy link
Member

enisoc commented May 16, 2017

@k8s-bot verify test this

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 51b4579 into kubernetes:release-1.6 May 17, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@gmarek gmarek

@enisoc enisoc

@vishh vishh

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
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@cjcullen @k8s-github-robot @gmarek @ikehz @enisoc @vishh @k8s-ci-robot