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

diff --cc src/lib/dhcpsrv/cql_host_data_source.cc
index 0b9352a53c9fe3ededdf0ff16ba458a2adfedaab,09016caf21cef6055e1fa41842b1e71894afe100..43bebf04590f29c81781ca8467080d6d4d3f496d
--- 1/src/lib/dhcpsrv/cql_host_data_source.cc
--- 2/src/lib/dhcpsrv/cql_host_data_source.cc
+++ b/src/lib/dhcpsrv/cql_host_data_source.cc
@@@ -847,7 -847,7 +847,8 @@@ CqlHostExchange::createBindForSend(cons
              reserved_ipv6_prefix_address_ = reservation->getPrefix().toText();
  
              // reserved_ipv6_prefix_length: int
--            reserved_ipv6_prefix_length_ = static_cast<cass_int32_t>(reservation->getPrefixLen());
++            reserved_ipv6_prefix_length_ =
++                static_cast<cass_int32_t>(reservation->getPrefixLen());
  
              // reserved_ipv6_prefix_address: int
              reserved_ipv6_prefix_address_type_ =

diff --cc src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
index 24d0ba4814f176793c126d9f3de9b7d7ecd01974,24d0ba4814f176793c126d9f3de9b7d7ecd01974..684b76db8caac66c0b4d8edb6c214853d5b65465
--- 1/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
--- 2/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/cql_host_data_source_unittest.cc
@@@ -502,4 -502,4 +502,4 @@@ TEST_F(CqlHostDataSourceTest, testAddRo
          DbOperationError);
  }
  
--};  // anonymous namespace
++}  // namespace

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
index db7c494c3847681d26126a1abaabb577157c8030,db7c494c3847681d26126a1abaabb577157c8030..d5f6c135bf1e377d9aa84a3ece2e26424e445373
--- 1/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
--- 2/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
+++ b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.cc
@@@ -1499,6 -1499,6 +1499,6 @@@ GenericHostDataSourceTest::testMessageF
      ASSERT_NO_FATAL_FAILURE(compareHosts(host, from_hds));
  }
  
--}; // namespace test
--}; // namespace dhcp
--}; // namespace isc
++}  // namespace test
++}  // namespace dhcp
++}  // namespace isc

diff --cc src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
index 7ada26279c6011f4fc87d80072e3c1f675f4d85b,7ada26279c6011f4fc87d80072e3c1f675f4d85b..80a1fb3287f373448c68c826256b0929059625f1
--- 1/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
--- 2/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
+++ b/src/lib/dhcpsrv/tests/generic_host_data_source_unittest.h
@@@ -555,8 -555,8 +555,8 @@@ public
  
  };
  
--}; // namespace test
--}; // namespace dhcp
--}; // namespace isc
++}  // namespace test
++}  // namespace dhcp
++}  // namespace isc
  
  #endif