BIND 10 trac1154, updated. dfc13c8130787ee07e2386773a221524ac6d802b [trac1154] Remove redundant VERBOSE_MODE variable

[BIND 10 source code commits]

The branch, trac1154 has been updated
       via  dfc13c8130787ee07e2386773a221524ac6d802b (commit)
       via  6ee994f190d58df863c71389bf9f8edd38d8e3eb (commit)
       via  f240d7d1d55f4ae87bfd1acc9c07a90870f59a93 (commit)
       via  c5124556a1a8907a84bb2c2bd1912da0c0aaafcc (commit)
      from  1c5a66507b7dc2990709308979354d8e62646a28 (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 dfc13c8130787ee07e2386773a221524ac6d802b
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Aug 3 14:51:01 2011 +0100

    [trac1154] Remove redundant VERBOSE_MODE variable

commit 6ee994f190d58df863c71389bf9f8edd38d8e3eb
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Aug 3 14:50:40 2011 +0100

    [trac1154] Fix typo in message ID

commit f240d7d1d55f4ae87bfd1acc9c07a90870f59a93
Merge: 1c5a66507b7dc2990709308979354d8e62646a28 c5124556a1a8907a84bb2c2bd1912da0c0aaafcc
Author: Stephen Morris <stephen at isc.org>
Date:   Wed Aug 3 13:56:39 2011 +0100

    Merge branch 'master' into trac1154

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

Summary of changes:
 src/bin/zonemgr/zonemgr.py.in        |    3 +--
 src/bin/zonemgr/zonemgr_messages.mes |    2 +-
 src/lib/dns/rdata/in_1/srv_33.cc     |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index 971b339..00facf1 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -659,8 +659,7 @@ if '__main__' == __name__:
         parser = OptionParser()
         set_cmd_options(parser)
         (options, args) = parser.parse_args()
-        VERBOSE_MODE = options.verbose
-        if VERBOSE_MODE:
+        if options.verbose:
             logger.set_severity("DEBUG", 99)
 
         set_signal_handler()
diff --git a/src/bin/zonemgr/zonemgr_messages.mes b/src/bin/zonemgr/zonemgr_messages.mes
index d829a63..b23f54a 100644
--- a/src/bin/zonemgr/zonemgr_messages.mes
+++ b/src/bin/zonemgr/zonemgr_messages.mes
@@ -122,7 +122,7 @@ operation is not being managed by the zone manager.  This may indicate
 an error in the program (as the operation should not have been initiated
 if this were the case).  Please submit a bug report.
 
-% ZONEMGR_UNKNOWN_ZONE_NOTIFY notified zone %1 (class %2) is not known to the zone manager
+% ZONEMGR_UNKNOWN_ZONE_NOTIFIED notified zone %1 (class %2) is not known to the zone manager
 A NOTIFY was received but the zone that was the subject of the operation
 is not being managed by the zone manager.  This may indicate an error
 in the program (as the operation should not have been initiated if this
diff --git a/src/lib/dns/rdata/in_1/srv_33.cc b/src/lib/dns/rdata/in_1/srv_33.cc
index ea85779..c28c435 100644
--- a/src/lib/dns/rdata/in_1/srv_33.cc
+++ b/src/lib/dns/rdata/in_1/srv_33.cc
@@ -64,7 +64,7 @@ NumType
 tokenToNum(const string& num_token) {
     NumType num;
     try {
-        num = lexical_cast<NumType>(num_token);
+        num = boost::lexical_cast<NumType>(num_token);
     } catch (const boost::bad_lexical_cast& ex) {
         isc_throw(InvalidRdataText, "Invalid SRV numeric parameter: " <<
                   num_token);