mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge release v2.4.7 into develop-2.5

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-06 11:05:04 -05:00
parent 01628cdd31 8bad25b860
commit ce00226bc6
9 changed files with 136 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/core-functionality/ipam.md
View File

@ -4,7 +4,7 @@ The first step to documenting your IP space is to define its scope by creating a
* 10.0.0.0/8 (RFC 1918)
* 100.64.0.0/10 (RFC 6598)
* 172.16.0.0/20 (RFC 1918)
* 172.16.0.0/12 (RFC 1918)
* 192.168.0.0/16 (RFC 1918)
* One or more /48s within fd00::/8 (IPv6 unique local addressing)