X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ChangeLog;h=fd3cc4842c4d0fcd9c166d0faaf23cb2ea859870;hb=1fa2c9808557e9ad403c2bcf9f68da198eb989b8;hp=ad826dd4c9f485a3a51ea44fbe025f281a1ee400;hpb=59d0dc29f36c14ed2fcf22d8492e842bf76fffa1;p=matthijs%2Fupstream%2Fbackupninja-vserver.git

diff --git a/ChangeLog b/ChangeLog
index ad826dd..fd3cc48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 version 0.9.6 -- unreleased
     backupninja changes
-	fix bug in cstream definition, thanks Jamie McClelland
+	 . fix bug in cstream definition, thanks Jamie McClelland
+	 . Allow the entire backup run to be halted by an action, thanks to
+	   Matthew Palmer (Closes: #455836)
     handler changes
 	dup:
 	 . General cleanup
@@ -10,6 +12,9 @@ version 0.9.6 -- unreleased
 	   only trigger a warning on failure, since they should not stop backups
 	   from being done. Also migrated full/incremental backup switch to the
 	   new syntax.
+	ldap:
+	 . support HDB backend just as the BDB one, and make message clearer
+	   when no supported backend is found (Closes: #476910)
 	rdiff:
 	 . Fixed ignore_version default value missing
 	 . Add patch from Matthew Palmer to rdiff handler to incorporate sshoptions