Skip to content

Automated cherry pick of #56415 #56420

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
Merged
k8s-github-robot merged 2 commits into from
Nov 28, 2017
Merged

Automated cherry pick of #56415 #56420

k8s-github-robot merged 2 commits into from
Nov 28, 2017

Conversation

@liggitt
Copy link
Member

@liggitt liggitt commented Nov 27, 2017

Cherry pick of #56415 on release-1.6.

#56415: Include ServerName in tls transport cache key

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 27, 2017

@liggitt: All 'parent' PRs 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.

Details

The following parent PRs have neither the "release-note" nor the "release-note-action-required" labels: #56415.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 27, 2017
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Nov 27, 2017

@liggitt: Adding do-not-merge/release-note-label-needed because the release note process has not been followed.

Details

One of the following labels is required "release-note", "release-note-action-required", or "release-note-none".
Please see: https://github.com/kubernetes/community/blob/master/contributors/devel/pull-requests.md#write-release-notes-if-needed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 27, 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/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Nov 27, 2017
@liggitt liggitt added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Nov 27, 2017
@liggitt
Copy link
Member Author

liggitt commented Nov 27, 2017

utility method didn't exist in this release... the fields overwritten in the test client config are ok with a shallow copy, so switched to that for the cherry-pick

@liggitt liggitt force-pushed the automated-cherry-pick-of-#56415-upstream-release-1.6 branch from 2e98c31 to db1e41f Compare November 27, 2017 18:41
@caesarxuchao
Copy link
Contributor

caesarxuchao commented Nov 27, 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 Nov 27, 2017
@k8s-github-robot
Copy link

k8s-github-robot commented Nov 27, 2017

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: caesarxuchao, liggitt

Associated issue: 56415

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

Details 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

@liggitt liggitt added this to the v1.6 milestone Nov 27, 2017
@liggitt
Copy link
Member Author

liggitt commented Nov 27, 2017

/sig api-machinery
/kind bug

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. kind/bug Categorizes issue or PR as related to a bug. labels Nov 27, 2017
@liggitt liggitt assigned enisoc and unassigned wojtek-t Nov 27, 2017
@liggitt
Copy link
Member Author

liggitt commented Nov 28, 2017

@enisoc for cherry-pick approval

@enisoc enisoc added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Nov 28, 2017
@k8s-github-robot
Copy link

k8s-github-robot commented Nov 28, 2017

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

k8s-github-robot commented Nov 28, 2017

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 7f46075 into kubernetes:release-1.6 Nov 28, 2017
@liggitt liggitt deleted the automated-cherry-pick-of-#56415-upstream-release-1.6 branch April 22, 2019 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@caesarxuchao caesarxuchao

@enisoc enisoc

@deads2k deads2k

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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

v1.6

Development

Successfully merging this pull request may close these issues.

7 participants

@liggitt @k8s-ci-robot @caesarxuchao @k8s-github-robot @enisoc @deads2k @wojtek-t