]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'github70' (missing CQL backend features)
authorTomek Mrugalski <tomasz@isc.org>
Mon, 12 Mar 2018 18:02:29 +0000 (18:02 +0000)
committerTomek Mrugalski <tomasz@isc.org>
Mon, 12 Mar 2018 18:02:29 +0000 (18:02 +0000)
 - host delete
 - user-contexts
 - DHCPv4 fixed fields
 - also PostgreSQL now stores hwaddr type and hwaddr source

# Conflicts:
# src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc

1  2 
configure.ac
src/lib/dhcpsrv/pgsql_host_data_source.cc
src/lib/dhcpsrv/pgsql_host_data_source.h
src/lib/dhcpsrv/pgsql_lease_mgr.cc
src/lib/dhcpsrv/pgsql_lease_mgr.h
src/lib/dhcpsrv/tests/mysql_host_data_source_unittest.cc
src/lib/dhcpsrv/tests/pgsql_host_data_source_unittest.cc
src/lib/dhcpsrv/tests/pgsql_lease_mgr_unittest.cc
src/share/database/scripts/pgsql/dhcpdb_create.pgsql

diff --cc configure.ac
Simple merge
index 3ad0a048ebc129a268b745937335938263abf442,9006e117e95efd0a692ac02b7e0b54205d63890b..ae18261a2db0f87bf5c174ea2f3c5fa391c4e719
@@@ -1923,14 -1917,11 +1919,12 @@@ PgSqlHostDataSourceImpl::checkReadOnly(
      }
  }
  
  /*********** PgSqlHostDataSource *********************/
  
  PgSqlHostDataSource::
 -PgSqlHostDataSource(const PgSqlConnection::ParameterMap& parameters)
 -    : impl_(new PgSqlHostDataSourceImpl(parameters)) {
 +PgSqlHostDataSource(const PgSqlConnection::ParameterMap& parameters,
 +                    DatabaseConnection::DbLostCallback db_lost_callback)
 +    : impl_(new PgSqlHostDataSourceImpl(parameters, db_lost_callback)) {
  }
  
  PgSqlHostDataSource::~PgSqlHostDataSource() {
Simple merge
Simple merge