From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Wed, 11 Jan 2017 12:17:19 +0000 (+0200)
Subject: Merge branch 'cassandra-host-data-source' of https://github.com/andreipavelQ/kea... 
X-Git-Tag: trac5425a_base~11^2~1^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cdfc595903c6d103d1fd77d77f78426cd64823;p=thirdparty%2Fkea.git

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

69cdfc595903c6d103d1fd77d77f78426cd64823
diff --cc src/lib/dhcpsrv/cql_host_data_source.cc
index 0b9352a53c,09016caf21..43bebf0459
--- a/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 24d0ba4814,24d0ba4814..684b76db8c
--- a/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 db7c494c38,db7c494c38..d5f6c135bf
--- a/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 7ada26279c,7ada26279c..80a1fb3287
--- a/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