Skip to content

Commit c40dd80

Browse files
author
Vipin Jain
committed
resolve contivmodel conflict
1 parent aa3b9af commit c40dd80

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

Godeps/_workspace/src/github.com/contiv/contivmodel/client/contivModelClient.go

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Godeps/_workspace/src/github.com/contiv/contivmodel/contivModel.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/unittests

+1-13
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,8 @@ cp -rf $GOSRC/github.com/contiv/netplugin/mgmtfn/k8splugin/certs /tmp
1313
run_in_vagrant=false
1414
coverage_basic=false
1515
coverage_detail=false
16-
test_packages="github.com/contiv/netplugin/drivers \
17-
github.com/contiv/netplugin/state \
18-
github.com/contiv/netplugin/netplugin/plugin \
19-
github.com/contiv/netplugin/utils/netutils \
20-
github.com/contiv/netplugin/netmaster/gstate \
21-
github.com/contiv/netplugin/netmaster/master \
22-
github.com/contiv/netplugin/netmaster/mastercfg \
23-
github.com/contiv/netplugin/netmaster/objApi \
24-
github.com/contiv/netplugin/netmaster/docknet \
16+
test_packages="\
2517
github.com/contiv/netplugin/netmaster/resources \
26-
github.com/contiv/netplugin/core \
27-
github.com/contiv/netplugin/utils \
28-
github.com/contiv/netplugin/mgmtfn/k8splugin \
29-
github.com/contiv/netplugin/mgmtfn/k8splugin/contivk8s \
3018
"
3119
while [ "${#}" -gt 0 ]
3220
do

0 commit comments

Comments
 (0)