Skip to content

Commit 2773d79

Browse files
author
shaleman
committed
rebase and godep update
1 parent 9a6c2f3 commit 2773d79

File tree

13 files changed

+62
-57
lines changed

13 files changed

+62
-57
lines changed

Godeps/Godeps.json

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

Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ rm /etc/docker/key.json
6868
(service docker restart) || exit 1
6969
7070
usermod -aG docker vagrant
71-
docker load --input #{gopath_folder}/src/github.com/contiv/netplugin/scripts/dnscontainer.tar && echo "Loading skydns container failed"
71+
docker load --input #{gopath_folder}/src/github.com/contiv/netplugin/scripts/dnscontainer.tar || echo "Loading skydns container failed"
7272
7373
SCRIPT
7474

vendor/github.com/contiv/contivmodel/bgphost.json

100644100755
File mode changed.

vendor/github.com/contiv/contivmodel/generate.sh

100644100755
File mode changed.

vendor/github.com/contiv/contivmodel/servicelb.json

100644100755
File mode changed.

vendor/github.com/contiv/objdb/consulService.go

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

vendor/github.com/contiv/ofnet/ofctrl/ofSwitch.go

100644100755
File mode changed.

vendor/github.com/contiv/ofnet/ofctrl/ofctrl.go

100644100755
File mode changed.

vendor/github.com/contiv/ofnet/ofnetAgent.go

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

vendor/github.com/contiv/ofnet/ofnetBgp.go

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

vendor/github.com/contiv/ofnet/rpcHub/rpcHub.go

100644100755
-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/contiv/ofnet/util.go

100644100755
File mode changed.

0 commit comments

Comments
 (0)