Merge branch '1.0'

Conflicts:
	site/features.md
	test/110_encryption_test.sh
This commit is contained in:
Matthias Radestock committed 2015-07-14 15:41:10 +01:00
commit 16471d0a28
3 files changed
+14 -7

No files matched your search

+2 -2
View File
@@ -7,8 +7,8 @@ C2=10.2.1.7
start_suite "Ping over encrypted cross-host weave network"
weave_on $HOST1 launch --password notverysecure
weave_on $HOST2 launch --password notverysecure $HOST1
weave_on $HOST1 launch --password wfvAwt7sj
weave_on $HOST2 launch --password wfvAwt7sj $HOST1
start_container $HOST1 $C1/24 --name=c1
start_container $HOST2 $C2/24 --name=c2