Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-08 20:02:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge problem

Browse Source
This commit is contained in:
Olivier Berger 2011-04-25 22:29:57 +02:00
parent ca14175210
commit 55fe213f9b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
handlers/dup.in
View File

@ -25,13 +25,8 @@ getconf exclude
setsection dest
getconf incremental yes
getconf increments 30
<<<<<<< HEAD
getconf keep 60
getconf keepincroffulls all
=======
getconf keep 1Y
getconf keepincroffulls 6
>>>>>>> Now that there's some removal of increments for old fulls, we can keep fulls for a longer time, for instance 1Y which becomes default
getconf desturl
getconf awsaccesskeyid
getconf awssecretaccesskey