From: Mukund Sivaraman <muks@isc.org>
Date: Tue, 18 Feb 2014 13:15:34 +0000 (+0530)
Subject: Merge branch 'master' into trac2168
X-Git-Tag: bind10-1.2.0beta1-release~47^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e07be6f5511f491c1575b289b8ca288434664673;p=thirdparty%2Fkea.git

Merge branch 'master' into trac2168

Conflicts:
	src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
	src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
---

e07be6f5511f491c1575b289b8ca288434664673
diff --cc src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
index e7962dd080,23461805af..ea38e7c475
--- a/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsec3param_like_unittest.cc
@@@ -28,10 -27,10 +28,11 @@@
  #include <vector>
  
  using namespace std;
 -using isc::UnitTestUtil;
  using namespace isc::dns;
  using namespace isc::dns::rdata;
+ using namespace isc::util;
 +using isc::UnitTestUtil;
 +using isc::util::unittests::matchWireData;
  
  namespace {
  
diff --cc src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
index c057b58004,0af1a12f9a..9c2420075a
--- a/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
+++ b/src/lib/dns/tests/rdata_nsecbitmap_unittest.cc
@@@ -31,11 -30,11 +31,12 @@@
  #include <vector>
  
  using namespace std;
 -using boost::lexical_cast;
 -using isc::UnitTestUtil;
  using namespace isc::dns;
  using namespace isc::dns::rdata;
+ using namespace isc::util;
 +using isc::UnitTestUtil;
 +using isc::util::unittests::matchWireData;
 +using boost::lexical_cast;
  
  namespace {