reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.0'

Browse Source 
Conflicts:
	site/ipam.md
This commit is contained in:
Adam Harrison committed 2015-08-06 09:56:50 +01:00
2 parents f9127e90db ed3207afe7
commit 457e162d0c
1 file changed
+5 -6
Download Patch File Download Diff File Expand all files Collapse all files
site/ipam.md
+5 -6
View File
@@ -212,9 +212,8 @@ Allocator default subnet: 10.2.1.0/24
The first section covers the router; see the [troubleshooting
guide](troubleshooting.html#status-report) for full details.
The 'Allocator' section, which is only present if weave has been
started with the `--ipalloc-range` option, summarises the overall
position and lists which address ranges have been assigned to which
peer. Each range begins at the address shown and ends just before the
next address, or wraps around at the end of the subnet. The 'v' number
denotes how many times that entry has been updated.
The 'Allocator' section summarises the overall position and lists
which address ranges have been assigned to which peer. Each range
begins at the address shown and ends just before the next address, or
wraps around at the end of the subnet. The 'v' number denotes how many
times that entry has been updated.