Merge branch '1.6'

This commit is contained in:
Bryan Boreham committed 2016-07-07 11:20:50 +00:00
commit bd1a9d020c
1 file changed
+1 -1
+1 -1
View File
@@ -83,7 +83,7 @@ weave dns-add [<ip_address> ...] <container_id> [-h <fqdn>] |
<ip_address> ... -h <fqdn>
dns-lookup <unqualified_name>
weave status [targets | connections | peers | dns]
weave status [targets | connections | peers | dns | ipam]
report [-f <format>]
ps [<container_id> ...]