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

Fix a couple flannel invocations I missed #18456

Merged
merged 1 commit into from
Dec 11, 2015

Conversation

thockin
Copy link
Member

@thockin thockin commented Dec 9, 2015

@dalanlan @bprashanth

Do we have any reason not to ALWAYS run with --ip-masq?

@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Dec 9, 2015
@k8s-bot
Copy link

k8s-bot commented Dec 9, 2015

GCE e2e test build/test passed for commit c858eebc0ffd37010cce5a51d5792031dad515e6.

@roberthbailey
Copy link
Contributor

@k8s-bot unit test this

@dalanlan
Copy link
Contributor

@thockin What about Vagrant? It uses flannel too.

@thockin
Copy link
Member Author

thockin commented Dec 10, 2015

Good eyes - I missed that one again.

@thockin
Copy link
Member Author

thockin commented Dec 10, 2015

fixed

@k8s-bot
Copy link

k8s-bot commented Dec 10, 2015

GCE e2e test build/test passed for commit 6b830cf.

@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 10, 2015
@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Dec 11, 2015
@k8s-github-robot k8s-github-robot merged commit 1b90941 into kubernetes:master Dec 11, 2015
@thockin thockin deleted the bump-flannel-ver branch December 14, 2015 16:51
@thockin thockin restored the bump-flannel-ver branch December 14, 2015 16:51
@thockin thockin deleted the bump-flannel-ver branch January 4, 2016 04:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants