BIND 10 master, updated. 02f76675c5728649d65e63c29f0603d465730281 [master] remove extra whitespace
BIND 10 source code commits
bind10-changes at lists.isc.org
Thu May 31 16:52:48 UTC 2012
The branch, master has been updated
via 02f76675c5728649d65e63c29f0603d465730281 (commit)
from 92cdf7773ea4631eda41a15b5b5b21a4926ff391 (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 02f76675c5728649d65e63c29f0603d465730281
Author: Jeremy C. Reed <jreed at ISC.org>
Date: Thu May 31 11:52:13 2012 -0500
[master] remove extra whitespace
This was noticed when I tried to commit some merged code.
My git hook noticed the whitespace issues.
-----------------------------------------------------------------------
Summary of changes:
src/bin/bindctl/command_sets.py | 1 -
src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in | 1 -
src/bin/dbutil/dbutil.py.in | 2 +-
src/lib/cc/tests/Makefile.am | 2 +-
src/lib/config/module_spec.cc | 2 +-
src/lib/datasrc/rbnode_rrset.h | 2 +-
.../dns/rdata/generic/detail/nsec3param_common.cc | 1 -
src/lib/util/locks.h | 2 +-
tests/lettuce/features/bindctl_commands.feature | 2 +-
9 files changed, 6 insertions(+), 9 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/bindctl/command_sets.py b/src/bin/bindctl/command_sets.py
index 9e2c2ef..c001ec8 100644
--- a/src/bin/bindctl/command_sets.py
+++ b/src/bin/bindctl/command_sets.py
@@ -92,4 +92,3 @@ def prepare_execute_commands(tool):
module.add_command(cmd)
tool.add_module_info(module)
-
diff --git a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
index 66d8f2a..351e8bf 100644
--- a/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
+++ b/src/bin/cfgmgr/tests/b10-cfgmgr_test.py.in
@@ -209,7 +209,6 @@ class TestParseArgs(unittest.TestCase):
self.assertFalse(parsed.clear_config)
parsed = b.parse_options(['--clear-config'], TestOptParser)
self.assertTrue(parsed.clear_config)
-
if __name__ == '__main__':
unittest.main()
diff --git a/src/bin/dbutil/dbutil.py.in b/src/bin/dbutil/dbutil.py.in
index 81f351e..4b76a56 100755
--- a/src/bin/dbutil/dbutil.py.in
+++ b/src/bin/dbutil/dbutil.py.in
@@ -196,7 +196,7 @@ UPGRADES = [
}
# To extend this, leave the above statements in place and add another
-# dictionary to the list. The "from" version should be (2, 0), the "to"
+# dictionary to the list. The "from" version should be (2, 0), the "to"
# version whatever the version the update is to, and the SQL statements are
# the statements required to perform the upgrade. This way, the upgrade
# program will be able to upgrade both a V1.0 and a V2.0 database.
diff --git a/src/lib/cc/tests/Makefile.am b/src/lib/cc/tests/Makefile.am
index 08b7f33..e49b599 100644
--- a/src/lib/cc/tests/Makefile.am
+++ b/src/lib/cc/tests/Makefile.am
@@ -26,7 +26,7 @@ run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
# We need to put our libs first, in case gtest (or any dependency, really)
# is installed in the same location as a different version of bind10
-# Otherwise the linker may not use the source tree libs
+# Otherwise the linker may not use the source tree libs
run_unittests_LDADD = $(top_builddir)/src/lib/cc/libcc.la
run_unittests_LDADD += $(top_builddir)/src/lib/log/liblog.la
run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
diff --git a/src/lib/config/module_spec.cc b/src/lib/config/module_spec.cc
index a931070..98a991d 100644
--- a/src/lib/config/module_spec.cc
+++ b/src/lib/config/module_spec.cc
@@ -136,7 +136,7 @@ check_statistics_item_list(ConstElementPtr spec) {
&& item->contains("item_default")) {
if(!check_format(item->get("item_default"),
item->get("item_format"))) {
- isc_throw(ModuleSpecError,
+ isc_throw(ModuleSpecError,
"item_default not valid type of item_format");
}
}
diff --git a/src/lib/datasrc/rbnode_rrset.h b/src/lib/datasrc/rbnode_rrset.h
index 3e5d20a..3161cdb 100644
--- a/src/lib/datasrc/rbnode_rrset.h
+++ b/src/lib/datasrc/rbnode_rrset.h
@@ -81,7 +81,7 @@ struct AdditionalNodeInfo;
/// can refer to its definition, and only for that purpose. Otherwise this is
/// essentially a private class of the in-memory data source implementation,
/// and an application shouldn't directly refer to this class.
-///
+///
// Note: non-Doxygen-documented methods are documented in the base class.
class RBNodeRRset : public isc::dns::AbstractRRset {
diff --git a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
index a7a0bb4..6eea2c7 100644
--- a/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
+++ b/src/lib/dns/rdata/generic/detail/nsec3param_common.cc
@@ -127,4 +127,3 @@ parseNSEC3ParamWire(const char* const rrtype_name,
} // end of rdata
} // end of dns
} // end of isc
-
diff --git a/src/lib/util/locks.h b/src/lib/util/locks.h
index daaf216..da9e9cd 100644
--- a/src/lib/util/locks.h
+++ b/src/lib/util/locks.h
@@ -16,7 +16,7 @@
/// It also contains code to use boost/threads locks:
///
///
-/// All locks are dummy classes that don't actually do anything. At this moment,
+/// All locks are dummy classes that don't actually do anything. At this moment,
/// only the very minimal set of methods that we actually use is defined.
///
/// Note that we need to include <config.h> in our .cc files for that
diff --git a/tests/lettuce/features/bindctl_commands.feature b/tests/lettuce/features/bindctl_commands.feature
index 1ab506d..20a28fc 100644
--- a/tests/lettuce/features/bindctl_commands.feature
+++ b/tests/lettuce/features/bindctl_commands.feature
@@ -109,7 +109,7 @@ Feature: control with bindctl
# nested_command contains another execute script
When I send bind10 the command execute file data/commands/nested
last bindctl output should contain shouldshow
- last bindctl output should not contain Error
+ last bindctl output should not contain Error
# show commands from a file
When I send bind10 the command execute file data/commands/bad_command show
More information about the bind10-changes
mailing list