X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ChangeLog;h=2134c3c7da1b56f06756566a2822ff4d16803047;hb=c18c24b4e2aebf5328a3b4adc03895f6a5dffe04;hp=06f45d6114fecdf042e5857987c2a7e276b3d6d8;hpb=5297a4855d01d0b96a4842e2671269d2c604c427;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/ChangeLog b/ChangeLog
index 06f45d6..2134c3c 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,8 @@ 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.
+	 . Support every duplicity-supported transport with new configuration
+	   option desturl (Closes: #483712, #346040, Trac#2).
 	ldap:
 	 . support HDB backend just as the BDB one, and make message clearer
 	   when no supported backend is found (Closes: #476910)