[master] Merge branch 'trac5396' (docs for shared network commands)

author Tomek Mrugalski <tomasz@isc.org>

Tue, 24 Oct 2017 11:03:50 +0000 (12:03 +0100)

committer Tomek Mrugalski <tomasz@isc.org>

Tue, 24 Oct 2017 11:03:50 +0000 (12:03 +0100)
author Tomek Mrugalski <tomasz@isc.org>
Tue, 24 Oct 2017 11:03:50 +0000 (12:03 +0100)
committer Tomek Mrugalski <tomasz@isc.org>
Tue, 24 Oct 2017 11:03:50 +0000 (12:03 +0100)
diff --cc doc/guide/hooks.xml
Simple merge
diff --cc src/lib/dhcpsrv/tests/shared_network_unittest.cc
Simple merge
author	Tomek Mrugalski <tomasz@isc.org>
	Tue, 24 Oct 2017 11:03:50 +0000 (12:03 +0100)
committer	Tomek Mrugalski <tomasz@isc.org>
	Tue, 24 Oct 2017 11:03:50 +0000 (12:03 +0100)
		1	2
doc/guide/hooks.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/shared_network_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history