Merge branch '2.5'

common/docker/client.go

@@ -99,7 +99,9 @@ func (c *Client) AddObserver(ob ContainerObserver) error {
 		pending := make(pendingStarts)
 		retryInterval := InitialInterval
 		for {
-			events := make(chan *docker.APIEvents)
+			// Use a buffered chan so the client library can run ahead of the listener
+			// - Docker will drop an event if it is not collected quickly enough.
+			events := make(chan *docker.APIEvents, 1024)
 			if err := c.AddEventListener(events); err != nil {
 				c.errorf("Unable to add listener to Docker API: %s - retrying in %ds", err, retryInterval/time.Second)
 			} else {

site/kubernetes/kube-addon.md

@@ -339,6 +339,8 @@ UDP connection from 10.32.0.7:56648 to 10.32.0.11:80 blocked by Weave NPC.
 
 ### <a name="key-points"></a> Things to watch out for
 
+- Weave Net does not work on hosts running iptables 1.8 or above, only with 1.6.
+  Track this via issue [#3465](https://github.com/weaveworks/weave/issues/3465)
 - Don't turn on `--masquerade-all` on kube-proxy: this will change the
   source address of every pod-to-pod conversation which will make it
   impossible to correctly enforce network policies that restrict which