From: Jelte Jansen <jelte@isc.org>
Date: Tue, 27 Mar 2012 09:16:43 +0000 (+0200)
Subject: [master] update changelog for merge of #1443
X-Git-Tag: trac2351_base~226^2~116^2~95^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=423640029ecf6f138eb8b160fc40ca5afef44e4a;p=thirdparty%2Fkea.git

[master] update changelog for merge of #1443
---

diff --git a/ChangeLog b/ChangeLog
index b9840be405..1502866460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-411.   [func]          muks
+412.	[func]		jelte
+	Added a command-line option '--clear-config' to bind10, which causes
+	the system to create a backup of the existing configuration database
+	file, and start out with a clean default configuration. This can be
+	used if the configuration file is corrupted to the point where it
+	cannot be read anymore, and BIND 10 refuses to start. The name of
+	the backup file can be found in the logs (CFGMGR_RENAMED_CONFIG_FILE).
+	(Trac #1443, git 52b36c921ee59ec69deefb6123cbdb1b91dc3bc7)
+
+411.	[func]		muks
 	Add a -i/--no-kill command-line argument to bind10, which stops
 	it from sending SIGTERM and SIGKILL to other b10 processes when
 	they're shutting down.