From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 11 Oct 2017 08:04:16 +0000 (+0200)
Subject: [master] Merge branch 'trac5364'
X-Git-Tag: trac5297_base~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07ce52ee4ce65eeeea1890201812ac83a286658f;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5364'

# Conflicts:
#	src/bin/dhcp6/tests/config_parser_unittest.cc
---

07ce52ee4ce65eeeea1890201812ac83a286658f
diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
index 68a1a6588f,e7c0665f78..946ba5cb9c
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@@ -5732,7 -5673,7 +5732,7 @@@ TEST_F(Dhcp6ParserTest, sharedNetworksD
      ASSERT_TRUE(s->getInterfaceId());
      EXPECT_TRUE(iface_id2.equals(s->getInterfaceId()));
      EXPECT_EQ(IOAddress("2222::2"), s->getRelayInfo().addr_);
-     EXPECT_FALSE(s->getRapidCommit());
 -    EXPECT_EQ(true, s->getRapidCommit());
++    EXPECT_TRUE(s->getRapidCommit());
      EXPECT_EQ(Network::HR_OUT_OF_POOL, s->getHostReservationMode());
  
      // Ok, now check the second shared subnet.