[master] Merge branch 'trac5318'

author Marcin Siodelski <marcin@isc.org>

Wed, 5 Jul 2017 14:32:14 +0000 (16:32 +0200)

committer Marcin Siodelski <marcin@isc.org>

Wed, 5 Jul 2017 14:32:14 +0000 (16:32 +0200)
author Marcin Siodelski <marcin@isc.org>
Wed, 5 Jul 2017 14:32:14 +0000 (16:32 +0200)
committer Marcin Siodelski <marcin@isc.org>
Wed, 5 Jul 2017 14:32:14 +0000 (16:32 +0200)
diff --cc src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc
Simple merge
diff --cc src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Wed, 5 Jul 2017 14:32:14 +0000 (16:32 +0200)
committer	Marcin Siodelski <marcin@isc.org>
	Wed, 5 Jul 2017 14:32:14 +0000 (16:32 +0200)
		1	2
src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history