Update ChangeLog and authors.

diff --git a/AUTHORS b/AUTHORS
index 9202931ec9f9ccb0f234db223b177692afb35ca6..ccd8b3945a4da1304d9919facea9a6ff57e6b38f 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,7 +30,7 @@ Matthew Palmer <mpalmer@debian.org> -- halt loglevel feature
 dan@garthwaite.org -- reportspace bugfix
 Tuomas Jormola <tj@solitudo.net> -- "when = manual" option
 Ian Beckwith <ianb@erislabs.net> -- dup bandwidthlimit fix, dup helper fix
-Olivier Berger <oberger@ouvaton.org> -- much work on the dup handler
+Olivier Berger <oberger@ouvaton.org> -- numerous contributions
 stefan <s.freudenberg@jpberlin.de> -- dup support for Amazon S3 buckets
 maniacmartin <martin@maniacmartin.com> -- rdiff confusing error message fix
 Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion

diff --git a/ChangeLog b/ChangeLog
index 03f227be62ef14808aa0303d1e36b00f75cd33ea..276467e502929884e989f72f5cf724823db4edf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 version 0.9.9 -- UNRELEASED
+    backupninja changes
+        . Use locking to avoid running concurrent instances of the same backup
+          action. Thanks to Olivier Berger <oberger@ouvaton.org> for the patch.
+          (Closes: #511300)
     handler changes
        dup:
         . Use --tempdir option rather than TMPDIR environment variable.