Merge branch 'cassandra-host-data-source' of https://github.com/andreipavelQ/kea...

author Tomek Mrugalski <tomasz@isc.org>

Fri, 29 Dec 2017 15:07:54 +0000 (16:07 +0100)

committer Tomek Mrugalski <tomasz@isc.org>

Fri, 29 Dec 2017 15:07:54 +0000 (16:07 +0100)
author Tomek Mrugalski <tomasz@isc.org>
Fri, 29 Dec 2017 15:07:54 +0000 (16:07 +0100)
committer Tomek Mrugalski <tomasz@isc.org>
Fri, 29 Dec 2017 15:07:54 +0000 (16:07 +0100)
diff --cc configure.ac
Simple merge
diff --cc doc/guide/dhcp4-srv.xml
Simple merge
diff --cc doc/guide/dhcp6-srv.xml
Simple merge
diff --cc src/lib/dhcpsrv/Makefile.am
Simple merge
diff --cc src/lib/dhcpsrv/cql_connection.h
Simple merge
diff --cc src/lib/dhcpsrv/tests/Makefile.am
Simple merge
diff --cc src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
Simple merge
author	Tomek Mrugalski <tomasz@isc.org>
	Fri, 29 Dec 2017 15:07:54 +0000 (16:07 +0100)
committer	Tomek Mrugalski <tomasz@isc.org>
	Fri, 29 Dec 2017 15:07:54 +0000 (16:07 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
doc/guide/dhcp4-srv.xml	patch \|	diff1 \|	diff2 \|	blob \| history
doc/guide/dhcp6-srv.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/cql_connection.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history