]> git.ipfire.org Git - thirdparty/kea.git/commit
fixed merge
authorRazvan Becheriu <razvan.becheriu@qualitance.com>
Tue, 6 Feb 2018 13:10:06 +0000 (15:10 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 8 Feb 2018 08:33:21 +0000 (08:33 +0000)
commit1c5274dcb8720278271fe6451786dcd90b06974c
tree1fa84a986adb5c8d01dc1deb4a5a3463a8195bd8
parent915f205fac0bfeeac7ba17026e66841da0e3b0b0
fixed merge
src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
src/share/database/scripts/cql/dhcpdb_create.cql