BIND 10 master, updated. 2f0aa20b44604b671e6bde78815db39381e563bf Merge branch 'master' into trac1405

[BIND 10 source code commits]

The branch, master has been updated
       via  2f0aa20b44604b671e6bde78815db39381e563bf (commit)
       via  07d2c46d78d35556a3e83f490eaa1aee9563e494 (commit)
      from  8cabb13b990bd2536af98d5a73edaa31b0928f9d (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 2f0aa20b44604b671e6bde78815db39381e563bf
Merge: 07d2c46d78d35556a3e83f490eaa1aee9563e494 8cabb13b990bd2536af98d5a73edaa31b0928f9d
Author: Stephen Morris <stephen at isc.org>
Date:   Fri Dec 16 15:28:44 2011 +0000

    Merge branch 'master' into trac1405

commit 07d2c46d78d35556a3e83f490eaa1aee9563e494
Author: Stephen Morris <stephen at isc.org>
Date:   Mon Dec 12 11:16:13 2011 +0000

    [1405] Make default "flush" option for logging "true"
    
    By default, the logging layer should now flush after each message.

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

Summary of changes:
 src/bin/cfgmgr/plugins/logging.spec         |    2 +-
 src/lib/log/output_option.h                 |    2 +-
 src/lib/log/tests/output_option_unittest.cc |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/cfgmgr/plugins/logging.spec b/src/bin/cfgmgr/plugins/logging.spec
index e377b0e..da20ce5 100644
--- a/src/bin/cfgmgr/plugins/logging.spec
+++ b/src/bin/cfgmgr/plugins/logging.spec
@@ -57,7 +57,7 @@
                       { "item_name": "flush",
                         "item_type": "boolean",
                         "item_optional": false,
-                        "item_default": false
+                        "item_default": true
                       },
                       { "item_name": "maxsize",
                         "item_type": "integer",
diff --git a/src/lib/log/output_option.h b/src/lib/log/output_option.h
index cbb7e95..8dfdd70 100644
--- a/src/lib/log/output_option.h
+++ b/src/lib/log/output_option.h
@@ -60,7 +60,7 @@ struct OutputOption {
 
     /// \brief Constructor
     OutputOption() : destination(DEST_CONSOLE), stream(STR_STDERR),
-                     flush(false), facility("LOCAL0"), filename(""),
+                     flush(true), facility("LOCAL0"), filename(""),
                      maxsize(0), maxver(0)
     {}
 
diff --git a/src/lib/log/tests/output_option_unittest.cc b/src/lib/log/tests/output_option_unittest.cc
index 8f0e0de..ce00bb6 100644
--- a/src/lib/log/tests/output_option_unittest.cc
+++ b/src/lib/log/tests/output_option_unittest.cc
@@ -29,7 +29,7 @@ TEST(OutputOptionTest, Initialization) {
 
     EXPECT_EQ(OutputOption::DEST_CONSOLE, option.destination);
     EXPECT_EQ(OutputOption::STR_STDERR, option.stream);
-    EXPECT_FALSE(option.flush);
+    EXPECT_TRUE(option.flush);
     EXPECT_EQ(string("LOCAL0"), option.facility);
     EXPECT_EQ(string(""), option.filename);
     EXPECT_EQ(0, option.maxsize);