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

Fix flannel version #3953

Merged
merged 1 commit into from
Nov 28, 2017
Merged

Fix flannel version #3953

merged 1 commit into from
Nov 28, 2017

Conversation

mikesplain
Copy link
Contributor

Breaking out from #3952 since this is needed for Kops 1.8

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 28, 2017
@mikesplain
Copy link
Contributor Author

/assign @chrislovecnm

@chrislovecnm
Copy link
Contributor

/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 28, 2017
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrislovecnm

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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 28, 2017
@k8s-github-robot
Copy link

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

@chrislovecnm chrislovecnm added this to the 1.8.0 milestone Nov 28, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit d8df54b into kubernetes:master Nov 28, 2017
@mikesplain mikesplain mentioned this pull request Nov 29, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Dec 14, 2017
Merge pull request #3952 from mikesplain/fix_flannel_nonMasqueradeCIDR
3fc8ddd 
Automatic merge from submit-queue.

Fix Flannel nonMasqueradeCIDR

Fixes #3950

~~And looks like we forgot to bump the version in `bootstrapchannelbuilder.go`~~(moved to #3953) (thanks @jkemp101)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrislovecnm chrislovecnm chrislovecnm approved these changes

Assignees

@chrislovecnm chrislovecnm

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. blocks-next 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
Milestone
1.8.0
Development

Successfully merging this pull request may close these issues.
4 participants
@mikesplain @chrislovecnm @k8s-ci-robot @k8s-github-robot