Merge branch '2.4'

2018-08-17 12:24:23 +02:00
commit 9899780f35
@@ -53,6 +53,7 @@ weave launch        [--password <pass>] [--trusted-subnets <cidr>,...]
                    [--hostname-replacement <replacement>]
                    [--rewrite-inspect]
                    [--log-level=debug|info|warning|error]
+                    [--token <weave-cloud-service-token>]
                    <peer> ...

 weave prime