From b635f9a994e909bbfea9fd258f1e16eed09eee11 Mon Sep 17 00:00:00 2001
From: Anita Buehrle <abuehrle@users.noreply.github.com>
Date: Fri, 2 Sep 2016 11:38:59 -0500
Subject: [PATCH 1/4] fixed broken link to command line args

---
 site/ipam.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/ipam.md b/site/ipam.md
index dbaa4e72..af52f654 100644
--- a/site/ipam.md
+++ b/site/ipam.md
@@ -202,4 +202,4 @@ named `weavedb` is used to store this data.
  **See Also**
 
  * [Automatic Allocation Across Multiple Subnets](/site/ipam/allocation-multi-ipam.md)
- * [Plugin Command-line Arguments](/site/plugin/plug-in-command-line.md)
+ * [Integrating Docker via the Network Plugin](/site/plugin.md)

From 8ed0c136454a3b9135aac9bbdcf72020bb402b68 Mon Sep 17 00:00:00 2001
From: Anita Buehrle <abuehrle@users.noreply.github.com>
Date: Fri, 2 Sep 2016 11:44:19 -0500
Subject: [PATCH 2/4] removed broken link

---
 site/plugin/plugin-how-it-works.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/site/plugin/plugin-how-it-works.md b/site/plugin/plugin-how-it-works.md
index 54d9f26a..62dfaa7a 100644
--- a/site/plugin/plugin-how-it-works.md
+++ b/site/plugin/plugin-how-it-works.md
@@ -38,6 +38,5 @@ The plugin accepts the following options via `docker network create ... --opt`:
 
 **See Also**
 
- * [Using the Weave Net Docker Network Plugin](/site/plugin.md)
- * [Plugin Command-line Arguments](/site/plugin/plug-in-command-line.md)
+ * [Integrating Docker via the Network Plugin](/site/plugin.md)
  

From a1de7f3eef1d68b37bc2440a43509508a1b9a996 Mon Sep 17 00:00:00 2001
From: Martynas Pumputis <martynasp@gmail.com>
Date: Wed, 14 Sep 2016 11:05:00 +0100
Subject: [PATCH 3/4] Enable unsolicited ARPs in 830 test case

Otherwise, ping (c1->c3) after the address reuse might time out.
---
 test/830_cni_plugin_test.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/830_cni_plugin_test.sh b/test/830_cni_plugin_test.sh
index b4700502..f042c294 100755
--- a/test/830_cni_plugin_test.sh
+++ b/test/830_cni_plugin_test.sh
@@ -16,8 +16,10 @@ run_on $HOST1 sudo mkdir -p /opt/cni/bin
 weave_on $HOST1 setup-cni
 weave_on $HOST1 launch
 
-C1=$(docker_on $HOST1 run --net=none --name=c1 -dt $SMALL_IMAGE /bin/sh)
+C1=$(docker_on $HOST1 run --net=none --privileged --name=c1 -dt $SMALL_IMAGE /bin/sh)
 C2=$(docker_on $HOST1 run --net=none --name=c2 -dt $SMALL_IMAGE /bin/sh)
+# Enable unsolicited ARPs so that ping after the address reuse does not time out
+exec_on $HOST1 c1 sysctl -w net.ipv4.conf.all.arp_accept=1
 
 cni_connect $HOST1 c1 <<EOF
 {
@@ -25,6 +27,7 @@ cni_connect $HOST1 c1 <<EOF
     "type": "weave-net"
 }
 EOF
+
 cni_connect $HOST1 c2 <<EOF
 {
     "name": "weave",
@@ -44,7 +47,6 @@ 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 2
 
 docker_on $HOST1 run --net=none --name=c3 -dt $SMALL_IMAGE /bin/sh
 

From 6df2782d737d819470ab898642dfff05e4395026 Mon Sep 17 00:00:00 2001
From: Martynas Pumputis <martynasp@gmail.com>
Date: Wed, 14 Sep 2016 17:15:33 +0100
Subject: [PATCH 4/4] Update weaveworks/mesh submodule

---
 vendor/github.com/weaveworks/mesh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/github.com/weaveworks/mesh b/vendor/github.com/weaveworks/mesh
index 115e1393..50329b41 160000
--- a/vendor/github.com/weaveworks/mesh
+++ b/vendor/github.com/weaveworks/mesh
@@ -1 +1 @@
-Subproject commit 115e1393da1c50fee0e418bcd772d3a85ca4e7ee
+Subproject commit 50329b4166c9c7d4024470996fa55956902d7815