Merge branch '1.9'

site/installing-weave.md

@@ -5,7 +5,7 @@ menu_order: 30
 
 
 Ensure you are running Linux (kernel 3.8 or later) and have Docker
-(version 1.6.0 or later) installed. 
+(version 1.10.0 or later) installed.
 
 Install Weave Net by running the following:
 

test/README.md

@@ -2,7 +2,7 @@ This directory contains integration tests for weave.
 
 ## Requirements
 
-You need three VMs with `docker` (`>=1.6.0`) installed and listening on TCP
+You need three VMs with `docker` (`>=1.10.0`) installed and listening on TCP
 port `2375` (see below). You also need to be able to SSH to these VMs without 
 having to input anything.