Merge pull request #3413 from weaveworks/connlimit

document connection limit

site/concepts/network-topology.md

@@ -142,6 +142,15 @@ is not reachable, then the packet is dropped.  For most protocols
 (for example, TCP), the transmission will be retried a short time later, by
 which time the topology should have updated.
 
+#### <a name="connection-limit"></a>Connection Limit
+
+In a fully connected mesh of N peers, this would mean N^2 connections. To constrain the resource consumption and 
+communication between the peers and complexity of route calculation there is a configurable upper limit on the 
+maximum number of connections that a peer can make to the remote peers. There is safe default value (100) which works
+for most deployment. However if you would like to increase the number of peers, you should be able to explicitly override the
+default value by passing the value through `connlimit` flag for e.g.`weave launch --connlimit=100`. If you are using Weave with
+Kubernetes using [Kubernetes Addon](/site/kubernetes/kube-addon.md) then you can set CONN_LIMIT environment variable to set
+the connection limit.
 
 **See Also**
 

site/kubernetes/kube-addon.md

@@ -376,7 +376,7 @@ The list of variables you can set is:
 * `CHECKPOINT_DISABLE` - if set to 1, disable checking for new Weave Net
   versions (default is blank, i.e. check is enabled)
 * `CONN_LIMIT` - soft limit on the number of connections between
-  peers. Defaults to 30.
+  peers. Defaults to 100.
 * `HAIRPIN_MODE` - Weave Net defaults to enabling hairpin on the bridge side of
   the `veth` pair for containers attached. If you need to disable hairpin, e.g. your
   kernel is one of those that can panic if hairpin is enabled, then you can disable it