Merge branch 'master' into dev/mac

k8snetworkplumbingwg · Oct 15, 2018 · b5d9240 · b5d9240
2 parents 974311b + 17ae9c2
commit b5d9240
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,12 +13,7 @@ before_install:
   - go get github.com/mattn/goveralls
 
 install:
-  # workaround golint install error in https://github.com/golang/lint/issues/288
-  - mkdir -p $GOPATH/src/golang.org/x
-  - pushd $GOPATH/src/golang.org/x
-  - git clone https://github.com/golang/lint.git
-  - go get github.com/golang/lint/golint
-  - popd
+  - go get -u golang.org/x/lint/golint
 
 before_script:
   - golint ./multus/... | grep -v ALL_CAPS | xargs -r false

diff --git a/multus/multus_test.go b/multus/multus_test.go
@@ -439,7 +439,7 @@ var _ = Describe("multus operations", func() {
 		]
     }
 }`
-		fExec.addPlugin(nil, "eth0", expectedConf1, nil, nil)
+		fExec.addPlugin(nil, "eth0", "", expectedConf1, nil, nil)
 		os.Setenv("CNI_COMMAND", "ADD")
 		os.Setenv("CNI_IFNAME", "eth0")
 		_, err := cmdAdd(args, fExec, nil)