Skip to content
This repository has been archived by the owner on Dec 7, 2023. It is now read-only.

CNI: fix conflist loading, avoid name collision and nil allocation #377

Merged
merged 1 commit into from
Aug 30, 2019
Merged

CNI: fix conflist loading, avoid name collision and nil allocation #377

merged 1 commit into from
Aug 30, 2019

Conversation

twelho
Copy link
Contributor

@twelho twelho commented Aug 30, 2019

Follow-up on #376, fixes config loading, as the extension needs to be .conflist instead of .conf now.

cc @luxas

@twelho twelho added kind/bug Categorizes issue or PR as related to a bug. kind/enhancement Categorizes issue or PR as related to improving an existing feature. labels Aug 30, 2019
@twelho twelho added this to the v0.6.0 milestone Aug 30, 2019
luxas
luxas approved these changes Aug 30, 2019
View reviewed changes
Copy link
Contributor

@luxas luxas left a comment

Choose a reason for hiding this comment

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

Thanks, had this locally but forgot to commit 😂
LGTM 👍

@twelho
Copy link
Contributor Author

twelho commented Aug 30, 2019

CI is green, merging 👍

@twelho twelho merged commit 3b8d059 into weaveworks:master Aug 30, 2019
@twelho twelho deleted the small-cni-fixes branch August 30, 2019 20:51
@luxas luxas added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed kind/bug Categorizes issue or PR as related to a bug. kind/enhancement Categorizes issue or PR as related to improving an existing feature. labels Aug 30, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@luxas luxas luxas approved these changes

Assignees

@luxas luxas

Labels
kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt.
Projects
None yet
Milestone
v0.6.0
Development

Successfully merging this pull request may close these issues.
2 participants
@twelho @luxas