Merge remote-tracking branch 'upstream/master'

circle.yml

@@ -44,11 +44,11 @@ test:
   post:
     - cd $SRCDIR/test; ./gce.sh destroy:
         parallel: true
+    - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; ./gen_coverage_reports.sh):
+        parallel: true
 
 teardown:
   pre:
-    - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; ./gen_coverage_reports.sh):
-        parallel: true
     - test "$CIRCLE_NODE_INDEX" != "0" || (go get github.com/mattn/goveralls && goveralls -repotoken $COVERALLS_REPO_TOKEN -coverprofile=$SRCDIR/test/profile.cov -service=circleci || true):
         parallel: true
     - test "$CIRCLE_NODE_INDEX" != "0" || (cd $SRCDIR/test; cp coverage.* $CIRCLE_ARTIFACTS):

site/ipam/stop-remove-peers-ipam.md

@@ -14,12 +14,13 @@ network so if Weave Net is run again on that node it will start from
 scratch.
 
 For failed peers, the `weave rmpeer` command can be invoked to
-permanently remove the ranges allocated to said peer.  This allows
+permanently remove the ranges allocated to said peers.  This allows
 other peers to allocate IPs in the ranges previously owned by the
-removed peer, and as such should be used with extreme caution - if the
-removed peer had transferred some range of IP addresses to another
-peer but this is not known to the whole network, or if it later
-rejoins the Weave network, the same IP address may be allocated twice.
+removed peers, and as such should be used with extreme caution: if the
+removed peers had transferred some range of IP addresses to other
+peers but this is not known to the whole network, or if some of them
+later rejoin the Weave network, the same IP address may be allocated
+twice.
 
 Assume you had started the three peers in the example earlier, and
 then host3 caught fire, you can go to one of the other hosts and run:

weave

@@ -87,13 +87,14 @@ weave stop
       stop-plugin
 
 weave reset
-      rmpeer        <nickname> | <weave internal peer ID>
+      rmpeer        <peer_id> ...
 
 
 where <peer>     = <ip_address_or_fqdn>[:<port>]
       <cidr>     = <ip_address>/<routing_prefix_length>
       <addr>     = [ip:]<cidr> | net:<cidr> | net:default
       <endpoint> = [tcp://][<ip_address>]:<port> | [unix://]/path/to/socket
+      <peer_id>  = <nickname> | <weave internal peer ID>
 EOF
 }
 
@@ -2223,9 +2224,12 @@ EOF
         done
         ;;
     rmpeer)
-        [ $# -eq 1 ] || usage
-        PEER=$1
-        call_weave DELETE /peer/$PEER
+        [ $# -gt 0 ] || usage
+        res=0
+        for PEER in "$@" ; do
+            call_weave DELETE /peer/$PEER || res=1
+        done
+        [ $res -eq 0 ]
         ;;
     launch-dns)
         echo "The 'launch-dns' command has been removed; DNS is launched as part of 'launch' and 'launch-router'." >&2