From e2fec3d007c432a24e278616cc33a81b9931d265 Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Wed, 12 Aug 2015 11:14:51 +0100 Subject: [PATCH 1/3] fix intermittent test failure Tests were running in the same shell, so function definitions were leaking between tests. --- test/run_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_all.sh b/test/run_all.sh index b0dddbd4..b0d71e18 100755 --- a/test/run_all.sh +++ b/test/run_all.sh @@ -36,7 +36,7 @@ echo Running $TESTS for t in $TESTS; do echo greyly echo "---= Running $t =---" - . $t + (. $t) # Report test runtime when running on circle, to help scheduler if [ -n "$CIRCLECI" ]; then From 2576e819a7916806a82d42533876436ceab418ec Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Wed, 12 Aug 2015 16:05:31 +0100 Subject: [PATCH 2/3] Revert "fix intermittent test failure" This reverts commit e2fec3d007c432a24e278616cc33a81b9931d265. Was causing a failure on circleci --- test/run_all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_all.sh b/test/run_all.sh index b0d71e18..b0dddbd4 100755 --- a/test/run_all.sh +++ b/test/run_all.sh @@ -36,7 +36,7 @@ echo Running $TESTS for t in $TESTS; do echo greyly echo "---= Running $t =---" - (. $t) + . $t # Report test runtime when running on circle, to help scheduler if [ -n "$CIRCLECI" ]; then From 4c566c858754710dde29698e01ca8d8786d89ce2 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Thu, 13 Aug 2015 11:34:16 +0100 Subject: [PATCH 3/3] correct typo --- site/proxy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/proxy.md b/site/proxy.md index 7a6eefde..53d3850a 100644 --- a/site/proxy.md +++ b/site/proxy.md @@ -103,7 +103,7 @@ To start a container without connecting it to the weave network, pass If you do not want IPAM to be used by default, the proxy needs to be passed the `--no-default-ipam` flag, e.g. - host1$ docker launch-proxy --no-default-ipam + host1$ weave launch-proxy --no-default-ipam In this configuration, containers with no `WEAVE_CIDR` environment variable will not be connected to the weave network. Containers