Merge branch '1.0'

This commit is contained in:
Matthias Radestock committed 2015-07-21 11:42:49 +01:00
commit 3c107d675a
2 files changed
+4 -1

No files matched your search

+3
View File
@@ -26,4 +26,7 @@ assert "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.1/24' $BASE_IMAGE hostn
docker_on $HOST1 run -dit --name c3 $SMALL_IMAGE /bin/sh
assert_raises "proxy docker_on $HOST1 exec c3 true"
# Check we can't modify weavewait
assert_raises "proxy docker_on $HOST1 run -e 'WEAVE_CIDR=10.2.1.2/24' $BASE_IMAGE touch /w/w" 1
end_suite