]> git.ipfire.org Git - thirdparty/kea.git/commit
[master] Merge branch 'github37' (Cassandra host reservations)
authorTomek Mrugalski <tomasz@isc.org>
Thu, 11 Jan 2018 14:43:59 +0000 (15:43 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 11 Jan 2018 14:43:59 +0000 (15:43 +0100)
commite37606fd2d0c02234a55f7445c52a12b2e7a82ec
tree4f2b8f563cdfd2e47c13f4056758ba4ebf825273
parent11d70ca9210623cb4ebab33533f9a06db150495c
parent8060cb78744af14057e15edf92f40c5fd637d5e6
[master] Merge branch 'github37' (Cassandra host reservations)

# Conflicts:
# src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
configure.ac
doc/guide/dhcp4-srv.xml
doc/guide/dhcp6-srv.xml
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/host.h
src/lib/dhcpsrv/mysql_host_data_source.cc
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
src/share/database/scripts/mysql/Makefile.am