BIND 10 master, updated. d75d622a266d7f0b8bddb9c4319acadcf0edac13 Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

[BIND 10 source code commits]

The branch, master has been updated
       via  d75d622a266d7f0b8bddb9c4319acadcf0edac13 (commit)
       via  4d9485ae50a13a37c1c1c4bb1dd43998c83d5c69 (commit)
      from  8eb7bcd370b766d260cd69001f119e4dea1e87cd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d75d622a266d7f0b8bddb9c4319acadcf0edac13
Merge: 4d9485ae50a13a37c1c1c4bb1dd43998c83d5c69 8eb7bcd370b766d260cd69001f119e4dea1e87cd
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Dec 14 07:40:08 2011 -0600

    Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10

commit 4d9485ae50a13a37c1c1c4bb1dd43998c83d5c69
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Dec 14 07:39:35 2011 -0600

    [master] whitespace police

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                                      |    2 +-
 src/bin/dhcp4/Makefile.am                         |    1 -
 src/lib/cryptolink/tests/Makefile.am              |    2 +-
 src/lib/datasrc/database.cc                       |    2 +-
 src/lib/statistics/tests/counter_dict_unittest.cc |    2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5dab45b..671a9b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -730,7 +730,7 @@ then
 				GTEST_FOUND="true"
 				# There is no gtest-config script on this
 				# system, which is supposed to inform us
-				# whether we need pthreads as well (a 
+				# whether we need pthreads as well (a
 				# gtest compile-time option). So we still
 				# need to test that manually.
 				CPPFLAGS_SAVED="$CPPFLAGS"
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 71a4531..d8c5819 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -39,4 +39,3 @@ b10_dhcp4_LDADD += $(top_builddir)/src/lib/log/liblog.la
 # and can't use @datadir@ because doesn't expand default ${prefix}
 b10_dhcp4dir = $(pkgdatadir)
 b10_dhcp4_DATA = dhcp4.spec
-
diff --git a/src/lib/cryptolink/tests/Makefile.am b/src/lib/cryptolink/tests/Makefile.am
index 6ac6fdf..fbe1bad 100644
--- a/src/lib/cryptolink/tests/Makefile.am
+++ b/src/lib/cryptolink/tests/Makefile.am
@@ -16,7 +16,7 @@ TESTS += run_unittests
 run_unittests_SOURCES = run_unittests.cc
 run_unittests_SOURCES += crypto_unittests.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
-run_unittests_LDFLAGS =  $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS) 
+run_unittests_LDFLAGS =  $(BOTAN_LDFLAGS) $(GTEST_LDFLAGS) $(AM_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD) $(BOTAN_LIBS)
 run_unittests_LDADD += $(top_builddir)/src/lib/util/libutil.la
 run_unittests_LDADD += $(top_builddir)/src/lib/cryptolink/libcryptolink.la
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 6e0b02b..bf7f6ae 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -412,7 +412,7 @@ DatabaseClient::Finder::findDelegationPoint(const isc::dns::Name& name,
     // cut but the match we find for the glue is a wildcard match.  In that
     // case, we return the delegation instead (see RFC 1034, section 4.3.3).
     // To save a new search, we record the location of the delegation cut when
-    // we encounter it here. 
+    // we encounter it here.
     isc::dns::ConstRRsetPtr first_ns;
 
     // We want to search from the apex down.  We are given the full domain
diff --git a/src/lib/statistics/tests/counter_dict_unittest.cc b/src/lib/statistics/tests/counter_dict_unittest.cc
index 34ab219..2578b46 100644
--- a/src/lib/statistics/tests/counter_dict_unittest.cc
+++ b/src/lib/statistics/tests/counter_dict_unittest.cc
@@ -101,7 +101,7 @@ TEST_F(CounterDictionaryTest, invalidCounterItem) {
 
 TEST_F(CounterDictionaryTest, uniquenessCheck) {
     // Adding an element which already exists will cause an isc::OutOfRange
-    //  exception 
+    //  exception
     EXPECT_THROW(counters.addElement("test"), isc::InvalidParameter);
 }