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.

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

Automated cherry pick of #48004 #48218

Conversation

dnardo
Copy link
Contributor

@dnardo dnardo commented Jun 28, 2017

Cherry pick of #48004 on release-1.7.

#48004: Do not set CNI on a private master when enabling network

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 28, 2017
@k8s-github-robot k8s-github-robot added this to the v1.7 milestone Jun 28, 2017
@k8s-github-robot k8s-github-robot added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jun 28, 2017
@marun
Copy link
Contributor

marun commented Jun 28, 2017

/test pull-kubernetes-e2e-kops-aws

@dnardo
Copy link
Contributor Author

dnardo commented Jun 28, 2017

/test pull-kubernetes-e2e-gce-etcd3

1 similar comment
@caesarxuchao
Copy link
Member

/test pull-kubernetes-e2e-gce-etcd3

@dchen1107 dchen1107 assigned dchen1107 and unassigned gmarek and jszczepkowski Jun 29, 2017
@dchen1107
Copy link
Member

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dchen1107, dnardo

Associated issue: 48004

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

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2017
@caesarxuchao
Copy link
Member

Manual merge.

@caesarxuchao caesarxuchao merged commit d420643 into kubernetes:release-1.7 Jun 29, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants