]> git.ipfire.org Git - thirdparty/kea.git/commit
[github36] Merge branch 'cassandra-host-data-source-stress-test' of https://github...
authorTomek Mrugalski <tomasz@isc.org>
Wed, 17 Jan 2018 13:41:58 +0000 (14:41 +0100)
committerTomek Mrugalski <tomasz@isc.org>
Wed, 17 Jan 2018 13:41:58 +0000 (14:41 +0100)
commit1cd7d3144301c4e722506a31a647f81444c00aa9
tree6e85a0a285791b407c24836c418efad1c3b51484
parentf124d85d24125ed117d1f56f11dd00f47c047306
parentd7c5a88563874884e9f2a91f0dda986880c753ab
[github36] Merge branch 'cassandra-host-data-source-stress-test' of https://github.com/andreipavelQ/kea into github36

# Conflicts:
# src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
configure.ac
src/lib/dhcpsrv/Makefile.am
src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h