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

Supply a default CNI config in the calico/cni container. #247

Merged
merged 1 commit into from Jan 12, 2017
Merged

Supply a default CNI config in the calico/cni container. #247

merged 1 commit into from Jan 12, 2017

Conversation

caseydavenport
Copy link
Member

Fixes #243

@caseydavenport caseydavenport self-assigned this Jan 5, 2017
tomdee
tomdee approved these changes Jan 10, 2017
View reviewed changes
Copy link
Contributor

@tomdee tomdee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@caseydavenport caseydavenport merged commit 05f42ff into projectcalico:master Jan 12, 2017
@caseydavenport caseydavenport deleted the default-cni-conf branch January 12, 2017 21:30
@caseydavenport caseydavenport mentioned this pull request Feb 6, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomdee tomdee tomdee approved these changes

Assignees

@caseydavenport caseydavenport

Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@caseydavenport @tomdee