Merge branch '1.4'

This commit is contained in:
Matthias Radestock committed 2015-12-31 01:11:06 +00:00
commit 1cc7ca18ba
1 file changed
+2 -4
+2 -4
View File
@@ -40,13 +40,11 @@ Usage:
weave --help | help
weave setup
weave version
weave launch [--password <password>] [--nickname <nickname>]
weave launch <same arguments as 'weave launch-router'>
weave launch-router [--password <password>] [--nickname <nickname>]
[--ipalloc-range <cidr> [--ipalloc-default-subnet <cidr>]]
[--no-discovery] [--init-peer-count <count>]
[--trusted-subnets <cidr>,...] <peer> ...
weave launch-router [--password <password>] [--nickname <nickname>]
[--ipalloc-range <cidr> [--ipalloc-default-subnet <cidr>]]
[--no-discovery] [--init-peer-count <count>] <peer> ...
weave launch-proxy [-H <endpoint>] [--without-dns]
[--no-default-ipalloc] [--no-rewrite-hosts]
[--no-multicast-route]