BIND 10 master, updated. 5a65fffe5a61fa87e8af0778e8859b6cb1ab796c [master] Added entry 768 for Trac #3373

[BIND 10 source code commits]

The branch, master has been updated
       via  5a65fffe5a61fa87e8af0778e8859b6cb1ab796c (commit)
      from  da3b0d4f364d069ffdb47723545798ac589fae42 (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 5a65fffe5a61fa87e8af0778e8859b6cb1ab796c
Author: Thomas Markwalder <tmark at isc.org>
Date:   Tue Mar 11 08:19:58 2014 -0400

    [master] Added entry 768 for Trac #3373
    
    Also moved entry 767 above the beta release line.

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

Summary of changes:
 ChangeLog |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 09c273d..ddbbe2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
-bind10-1.2.0beta1 released on March 6, 2014
+768.    [bug]       tmark
+	Python configuration library now properly merges changes into
+	configuration items that are maps of items.  This corrects a
+	defect in which a change to an item in a map of items could
+	committed, only to be lost upon committing a subsequent change
+	to same map of items during the same bindctl session.
+	(Trac #3373, git da3b0d4f364d069ffdb47723545798ac589fae42)
 
 767.	[func]		tomek
 	Unit-tests for all database backends are now shared. This improves
 	test coverage for memfile and any future backends that may appear.
 	(Trac #3359, git 3d6c11630ada9d0681a813cf026f6bb16aabb9fa)
 
+bind10-1.2.0beta1 released on March 6, 2014
+
 766.	[func]		muks
 	--disable-dns and --disable-dhcp configure arguments have been
 	added to conditionally disable the DNS or DHCP components