From: Naoki Kambe <kambe@jprs.co.jp>
Date: Mon, 20 Aug 2012 05:58:39 +0000 (+0900)
Subject: [2158] Merge branch 'trac2136' of ssh://git.bind10.isc.org/var/bind10/git/bind10... 
X-Git-Tag: trac2351_base~65^2~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8647cc12916a3be22650d5558e714a59bfdb0bcd;p=thirdparty%2Fkea.git

[2158] Merge branch 'trac2136' of ssh://git.bind10.isc.org/var/bind10/git/bind10 into trac2158

Conflicts:
	tests/system/bindctl/nsx1/b10-config.db.template.in
---

8647cc12916a3be22650d5558e714a59bfdb0bcd
diff --cc tests/system/bindctl/nsx1/b10-config.db.template.in
index 4c0b6dc22b,58ad377101..118e53318b
--- a/tests/system/bindctl/nsx1/b10-config.db.template.in
+++ b/tests/system/bindctl/nsx1/b10-config.db.template.in
@@@ -4,24 -4,7 +4,27 @@@
     "database_file": "@abs_builddir@/zone.sqlite3",
     "statistics-interval": 1
   },
 + "data_sources": {
 +    "classes": {
 +        "IN": [{
 +            "type": "sqlite3",
 +            "params": {
 +                "database_file": "@abs_builddir@/zone.sqlite3"
 +            }
 +        }]
 +    }
 + },
 + "Logging": {
 +     "loggers": [
 +        {
 +            "name": "*",
 +            "severity": "DEBUG",
 +            "output_options": [],
 +            "debuglevel": 99
 +        }
 +     ]
++ },
+  "Stats": {
+    "poll-interval": 1
   }
  }