reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.6'

Browse Source
This commit is contained in:
Martynas Pumputis committed 2016-08-16 18:03:00 +01:00
2 parents a466f55d59 8c8c6db7dd
commit 060f6392c7
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/830_cni_plugin_test.sh
+1 -1
View File
@@ -44,7 +44,7 @@ assert_raises "exec_on $HOST1 c2 $PING $C1IP"
# Now remove and start a new container to see if IP address re-use breaks things
docker_on $HOST1 rm -f c2
sleep 1
sleep 2
docker_on $HOST1 run --net=none --name=c3 -dt $SMALL_IMAGE /bin/sh
vendor/github.com/weaveworks/mesh
Generated Vendored
+1 -1
Submodule vendor/github.com/weaveworks/mesh updated: 23749aaef9...115e1393da.