From: Wlodek Wencel <wlodek@isc.org>
Date: Mon, 27 Jan 2014 15:49:25 +0000 (+0100)
Subject: [2892] Merge branch 'trac2892'
X-Git-Tag: bind10-1.2.0beta1-release~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bd69e9b4ab9be231f7c966fd62b95a4e1595901;p=thirdparty%2Fkea.git

[2892] Merge branch 'trac2892'
---

3bd69e9b4ab9be231f7c966fd62b95a4e1595901
diff --cc src/bin/dhcp6/tests/dhcp6_test_utils.h
index 82ff9847b8,52d6582925..17cd9e8cc7
--- a/src/bin/dhcp6/tests/dhcp6_test_utils.h
+++ b/src/bin/dhcp6/tests/dhcp6_test_utils.h
@@@ -111,8 -111,8 +111,9 @@@ public
      using Dhcpv6Srv::createRemovalNameChangeRequest;
      using Dhcpv6Srv::createStatusCode;
      using Dhcpv6Srv::selectSubnet;
+     using Dhcpv6Srv::testServerID;
      using Dhcpv6Srv::sanityCheck;
 +    using Dhcpv6Srv::classifyPacket;
      using Dhcpv6Srv::loadServerID;
      using Dhcpv6Srv::writeServerID;
      using Dhcpv6Srv::unpackOptions;