[master] Merge branch 'trac5468'

author Marcin Siodelski <marcin@isc.org>

Mon, 15 Jan 2018 12:59:28 +0000 (13:59 +0100)

committer Marcin Siodelski <marcin@isc.org>

Mon, 15 Jan 2018 12:59:28 +0000 (13:59 +0100)
author Marcin Siodelski <marcin@isc.org>
Mon, 15 Jan 2018 12:59:28 +0000 (13:59 +0100)
committer Marcin Siodelski <marcin@isc.org>
Mon, 15 Jan 2018 12:59:28 +0000 (13:59 +0100)
diff --cc doc/guide/hooks.xml
Simple merge
diff --cc src/hooks/dhcp/lease_cmds/lease_cmds.cc
Simple merge
diff --cc src/hooks/dhcp/lease_cmds/lease_cmds.h
Simple merge
diff --cc src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Mon, 15 Jan 2018 12:59:28 +0000 (13:59 +0100)
committer	Marcin Siodelski <marcin@isc.org>
	Mon, 15 Jan 2018 12:59:28 +0000 (13:59 +0100)
		1	2
doc/guide/hooks.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/hooks/dhcp/lease_cmds/lease_cmds.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/hooks/dhcp/lease_cmds/lease_cmds.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/hooks/dhcp/lease_cmds/tests/lease_cmds_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history