(no commit message)

diff --git a/changelog b/changelog
index 8f408e98fb8784ac44f56fe77d64e628e067a391..1872cdd5ec9aeeeb74cb2b69f590aabac35bbcad 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,9 +1,10 @@
-version 0.7 -- July 3 2005
+version 0.7 -- July 26 2005

        added ninjahelper: a dialog based wizard for creating backupninja configs.
        considerably improved and changed the log file output.
        you can now disable actions with .disabled (this is new preferred method).
        added ninjahelper: a dialog based wizard for creating backupninja configs.
        considerably improved and changed the log file output.
        you can now disable actions with .disabled (this is new preferred method).

-       added makecd handler and example.makecd for backing up to cd/dvd
-
+       added makecd handler and example.makecd for backing up to cd/dvd (thanks stef).
+    fixed bug when specifying multiple 'when' options.
+    

 version 0.6 -- June 16 2005
        ldap handler has new options: backup method to use (ldapsearch or
                slapcat), restart, passwordfile and binddn. Default backup method
 version 0.6 -- June 16 2005
        ldap handler has new options: backup method to use (ldapsearch or
                slapcat), restart, passwordfile and binddn. Default backup method


@@ -34,7 +35,6 @@ version 0.6 -- June 16 2005
                (.my.cnf files now have double quotes around password)
        can now pass options to hwinfo and sfdisk in sys handler.
 
                (.my.cnf files now have double quotes around password)
        can now pass options to hwinfo and sfdisk in sys handler.
 

->>>>>>> .r129

 version 0.5 -- April 12 2005
        rdiff handler works when remote sshd has a banner
        rdiff handler supports local dest 
 version 0.5 -- April 12 2005
        rdiff handler works when remote sshd has a banner
        rdiff handler supports local dest