BIND 10 master, updated. 9f92c87372c0a3b37fabb3ee1963dca5409ccde5 [master]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  9f92c87372c0a3b37fabb3ee1963dca5409ccde5 (commit)
       via  943453b21cb4a91ada2f0da363906e29d3659421 (commit)
       via  271a74c31ae50d5f713dd6bccc2127f56f950466 (commit)
       via  96f3f46af4cba730dfccaf13ea8350529dc71bb6 (commit)
       via  30004e59d00244ebea35e8df0abce51acb2cdef2 (commit)
       via  340c8a6ce05ef5c72e81801066191c18875bbec1 (commit)
      from  46af17adcadf913b3ee26a70394b8faaf5dd7b36 (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 9f92c87372c0a3b37fabb3ee1963dca5409ccde5
Merge: 943453b 46af17a
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu May 2 20:01:24 2013 -0500

    [master]Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
    
    fix conflict

commit 943453b21cb4a91ada2f0da363906e29d3659421
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu May 2 19:58:02 2013 -0500

    [master] update the master version to today's timestamp

commit 271a74c31ae50d5f713dd6bccc2127f56f950466
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu May 2 19:56:40 2013 -0500

    [master] remove correct directory for the clean-cpp-coverage target
    
    The directory has been wrong for a long time.
    Reviewed via jabber.

commit 96f3f46af4cba730dfccaf13ea8350529dc71bb6
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu May 2 19:52:30 2013 -0500

    [master] mention beta2 released date

commit 30004e59d00244ebea35e8df0abce51acb2cdef2
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu May 2 19:51:27 2013 -0500

    [master] fix typo

commit 340c8a6ce05ef5c72e81801066191c18875bbec1
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu May 2 19:50:31 2013 -0500

    [master] reorder
    
    used tools/reorder_message_file.py

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

Summary of changes:
 ChangeLog                                  |    4 +++-
 Makefile.am                                |    2 +-
 configure.ac                               |    2 +-
 src/lib/datasrc/memory/memory_messages.mes |    6 +++---
 4 files changed, 8 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 0889ff7..5552772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
+bind10-1.0.0beta2 released on May 3, 2013
+
 610.	[bug]		muks
 	When the sqlite3 program is not available on the system (in
 	PATH), we no longer attempt to run some tests which depend
@@ -67,7 +69,7 @@
 	(Trac #2770, git a622140d411b3f07a68a1451e19df36118a80650)
 
 602.	[bug]		tmark
-	Perdhcp will now exit gracefully if the command line argument for
+	Perfdhcp will now exit gracefully if the command line argument for
 	IP version (-4 or -6) does not match the command line argument
 	given for the server. Prior to this perfdhcp would core when given
 	an IP version of -6 but a valid IPv4 address for server.
diff --git a/Makefile.am b/Makefile.am
index 6ef95bc..10ef321 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,7 +46,7 @@ endif
 clean-cpp-coverage:
 	@if [ $(USE_LCOV) = yes ] ; then \
 		$(LCOV) --directory . --zerocounters; \
-		rm -rf coverage/; \
+		rm -rf $(abs_top_srcdir)/coverage-cpp-html/; \
 	else \
 		echo "C++ code coverage not enabled at configuration time." ; \
 		echo "Use: ./configure --with-lcov" ; \
diff --git a/configure.ac b/configure.ac
index 3e62279..af63958 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT(bind10, 20130221, bind10-dev at isc.org)
+AC_INIT(bind10, 20130503, bind10-dev at isc.org)
 AC_CONFIG_SRCDIR(README)
 # serial-tests is not available in automake version before 1.13. In
 # automake 1.13 and higher, AM_PROG_INSTALL is undefined, so we'll check
diff --git a/src/lib/datasrc/memory/memory_messages.mes b/src/lib/datasrc/memory/memory_messages.mes
index 8580c8e..cf51706 100644
--- a/src/lib/datasrc/memory/memory_messages.mes
+++ b/src/lib/datasrc/memory/memory_messages.mes
@@ -126,13 +126,13 @@ RRset is split into multiple locations is not supported yet.
 Debug information. A zone object for this zone is being searched for in the
 in-memory data source.
 
-% DATASRC_MEMORY_MEM_LOAD_FROM_FILE loading zone '%1/%2' from file '%3'
-Debug information. The content of master file is being loaded into the memory.
-
 % DATASRC_MEMORY_MEM_LOAD_FROM_DATASRC loading zone '%1/%2' from other data source
 Debug information. The content of another  data source is being loaded
 into the memory.
 
+% DATASRC_MEMORY_MEM_LOAD_FROM_FILE loading zone '%1/%2' from file '%3'
+Debug information. The content of master file is being loaded into the memory.
+
 % DATASRC_MEMORY_MEM_NO_NSEC3PARAM NSEC3PARAM is missing for NSEC3-signed zone %1/%2
 The in-memory data source has loaded a zone signed with NSEC3 RRs,
 but it doesn't have a NSEC3PARAM RR at the zone origin.  It's likely that