github/multus-cni
1
0
Fork 1
mirror of https://github.com/k8snetworkplumbingwg/multus-cni.git synced 2025-09-18 16:00:04 +00:00
Code Issues Projects Releases Wiki Activity

Fix rebase conflicts.

Browse Source
This commit is contained in:
Tomofumi Hayashi
2018-11-07 17:09:54 +09:00
committed by Tomofumi Hayashi
parent 41348f2de1
commit 9f00ea47f5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
types/conf.go
View File

@@ -223,7 +223,7 @@ func LoadNetConf(bytes []byte) (*NetConf, error) {
if err != nil {
return nil, logging.Errorf("error marshalling delegate %d config: %v", idx, err)
}
delegateConf, err := LoadDelegateNetConf(bytes, "", "")
delegateConf, err := LoadDelegateNetConf(bytes, nil, "")
if err != nil {
return nil, logging.Errorf("failed to load delegate %d config: %v", idx, err)
}