my changelog was in conflict, resolving this

[matthijs/upstream/backupninja.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a513d5a361bb5b24d49ff03fb84e16db53a82c14..203209af8160041b98310eadc95eae07913af47b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,15 @@ version 0.9.5 -- unreleased
        sys:
         . Fixed typo breaking things for VServers.
         . Fix bug when vrootdir is on its own partition (Closes: #395928)
+       rub
+        . Fixed typo in rub handler that caused it to not work
+        . Better sfdisk error and output handling: should now properly warn
+          when it does not manage to backup a partition table, and shut up when
+          it succeeds (Closes: #396632)
+       pgsql:
+        . Support configuring PGSQLUSER for real, and document it a bit; this
+          broken support actually prevented pgsql handler to work for VServers
+          (Closes: #396578)
     fixed automake 'make install' bug that failed if /etc/backup.d already
     existed