From ca14175210a0f12ef4802f057d07530a989e82f7 Mon Sep 17 00:00:00 2001
From: Olivier Berger <oberger@ouvaton.org>
Date: Sun, 14 Nov 2010 14:58:15 +0100
Subject: [PATCH] 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

---
 handlers/dup.helper.in | 4 ++--
 handlers/dup.in        | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in
index 413a4e71..98bce1c1 100644
--- a/handlers/dup.helper.in
+++ b/handlers/dup.helper.in
@@ -419,10 +419,10 @@ incremental = $dup_incremental
 #increments = keep
 increments = $dup_increments
 
-# how many days of data to keep ; default is 60 days.
+# how many days of data to keep ; default is 1 year.
 # (you can also use the time format of duplicity)
 # 'keep = yes' means : do not delete old data, the remote host will take care of this
-#keep = 60
+#keep = 1Y
 #keep = yes
 keep = $dup_keep
 
diff --git a/handlers/dup.in b/handlers/dup.in
index b58d34d8..29fd866e 100644
--- a/handlers/dup.in
+++ b/handlers/dup.in
@@ -25,8 +25,13 @@ 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
-- 
GitLab