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 #49017 #49073 #49094

Merged
merged 2 commits into from
Jul 19, 2017
Merged

Automated cherry pick of #49017 #49073 #49094

merged 2 commits into from
Jul 19, 2017

Conversation

luxas
Copy link
Member

@luxas luxas commented Jul 18, 2017

Cherry pick of #49017 #49073 on release-1.7.

#49017: kubeadm: Make kube-proxy tolerate the uninitialized cloud
#49073: pass nodename in join checks

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 18, 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 DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Jul 18, 2017
@luxas luxas added this to the v1.7 milestone Jul 18, 2017
@luxas luxas added release-note-none Denotes a PR that doesn't merit a release note. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 18, 2017
@wojtek-t
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 Jul 18, 2017
@wojtek-t wojtek-t 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 Jul 18, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: luxas, wojtek-t

Associated issue: 49017

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

@luxas
Copy link
Member Author

luxas commented Jul 18, 2017

/retest

@luxas luxas force-pushed the automated-cherry-pick-of-#49017-#49073-upstream-release-1.7 branch from c71e5e8 to 25b831f Compare July 18, 2017 11:01
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2017
@luxas
Copy link
Member Author

luxas commented Jul 18, 2017

Just re-ran bazel...

@luxas luxas added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2017
@wojtek-t
Copy link
Member

/test pull-kubernetes-federation-e2e-gce

@luxas
Copy link
Member Author

luxas commented Jul 18, 2017

/retest

@wojtek-t
Copy link
Member

/test pull-kubernetes-e2e-gce-etcd3

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c8f01bb into kubernetes:release-1.7 Jul 19, 2017
@mattmoyer mattmoyer mentioned this pull request Jul 28, 2017
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@timothysc timothysc

@dmmcquay dmmcquay

@wojtek-t wojtek-t

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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@luxas @wojtek-t @k8s-github-robot @timothysc @errordeveloper @lukemarsden @dmmcquay @k8s-ci-robot