BIND 10 master, updated. 6db3556488ae8a75f5250a175f3507cc609ada19 [master] disable SQLite3Update.rollbackFailure test

[BIND 10 source code commits]

The branch, master has been updated
       via  6db3556488ae8a75f5250a175f3507cc609ada19 (commit)
       via  f07fcf3c8e3f28d97772994f26520ac20436eba2 (commit)
       via  eb3cc6a30fc6ddf4124a0051d44bcfede286520e (commit)
       via  f027496530a43f7b5eb5beb840266a9bc5aaffec (commit)
      from  c9337b1576d127bfdf11ed0e87db9c6cc1f98a09 (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 6db3556488ae8a75f5250a175f3507cc609ada19
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Mar 28 15:23:04 2012 -0500

    [master] disable SQLite3Update.rollbackFailure test
    
    see ticket #1845

commit f07fcf3c8e3f28d97772994f26520ac20436eba2
Merge: eb3cc6a30fc6ddf4124a0051d44bcfede286520e c9337b1576d127bfdf11ed0e87db9c6cc1f98a09
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Wed Mar 28 14:56:56 2012 -0500

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

commit eb3cc6a30fc6ddf4124a0051d44bcfede286520e
Merge: f027496530a43f7b5eb5beb840266a9bc5aaffec 59464e665cd90e476e6c45843151ab6209a8517d
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Tue Mar 27 07:40:33 2012 -0500

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

commit f027496530a43f7b5eb5beb840266a9bc5aaffec
Author: Jeremy C. Reed <jreed at ISC.org>
Date:   Mon Mar 26 16:16:14 2012 -0500

    [master] fix mistake in xml tag
    
    filename argument is required
    
    No review. Typo is obvious. Not sure why xsltproc didn't complain though.
    
    Commit regenerated version too.

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

Summary of changes:
 src/bin/loadzone/b10-loadzone.8                    |    6 +++---
 src/bin/loadzone/b10-loadzone.xml                  |    4 ++--
 src/lib/datasrc/tests/sqlite3_accessor_unittest.cc |    3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/loadzone/b10-loadzone.8 b/src/bin/loadzone/b10-loadzone.8
index d563ff2..cf1c26b 100644
--- a/src/bin/loadzone/b10-loadzone.8
+++ b/src/bin/loadzone/b10-loadzone.8
@@ -2,12 +2,12 @@
 .\"     Title: b10-loadzone
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: March 8, 2010
+.\"      Date: March 26, 2012
 .\"    Manual: BIND10
 .\"    Source: BIND10
 .\"  Language: English
 .\"
-.TH "B10\-LOADZONE" "8" "March 8, 2010" "BIND10" "BIND10"
+.TH "B10\-LOADZONE" "8" "March 26, 2012" "BIND10" "BIND10"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -22,7 +22,7 @@
 b10-loadzone \- Load DNS Zone File
 .SH "SYNOPSIS"
 .HP \w'\fBb10\-loadzone\fR\ 'u
-\fBb10\-loadzone\fR [\fB\-d\ \fR\fB\fIdatabase\fR\fR] [\fB\-o\ \fR\fB\fIorigin\fR\fR] [filename]
+\fBb10\-loadzone\fR [\fB\-d\ \fR\fB\fIdatabase\fR\fR] [\fB\-o\ \fR\fB\fIorigin\fR\fR] {filename}
 .SH "DESCRIPTION"
 .PP
 The
diff --git a/src/bin/loadzone/b10-loadzone.xml b/src/bin/loadzone/b10-loadzone.xml
index 25e23a5..8c41e54 100644
--- a/src/bin/loadzone/b10-loadzone.xml
+++ b/src/bin/loadzone/b10-loadzone.xml
@@ -20,7 +20,7 @@
 <refentry>
 
   <refentryinfo>
-    <date>March 8, 2010</date>
+    <date>March 26, 2012</date>
   </refentryinfo>
 
   <refmeta>
@@ -46,7 +46,7 @@
       <command>b10-loadzone</command>
       <arg><option>-d <replaceable class="parameter">database</replaceable></option></arg>
       <arg><option>-o <replaceable class="parameter">origin</replaceable></option></arg>
-      <arg chose="req">filename</arg>
+      <arg choice="req">filename</arg>
     </cmdsynopsis>
   </refsynopsisdiv>
 
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 4f7a5d8..cd760b6 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -771,7 +771,8 @@ TEST_F(SQLite3Update, rollback) {
     checkRecords(*accessor, zone_id, "foo.bar.example.com.", expected_stored);
 }
 
-TEST_F(SQLite3Update, rollbackFailure) {
+// TODO: ticket #1845
+TEST_F(SQLite3Update,  DISABLED_rollbackFailure) {
     // This test emulates a rare scenario of making rollback attempt fail.
     // The iterator is paused in the middle of getting records, which prevents
     // the rollback operation at the end of the test.