From fb393b49c55c48023f9cd1d0f36a6fb60ae5b97f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sun, 1 Jan 2012 10:48:01 +0100
Subject: Update ChangeLog wrt. last cherry-picked patches.

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index fa319b8..6fca086 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@ version 1.0 -- UNRELEASED
 	rysnc:
 	 . Fix numericids option (Redmine#3691).
 	 . Mangle $rsync_options just afterwards (Redmine#3702).
+	 . Fix metadata rotation.
+	 . Allow disabling rotation or setting 2 days as minimum for backup
+	   increments in rsync short format (Redmine#2107).
+	 . Use fatal instead of custom "exit 1" (Redmine#3721).
+	 . Abort on rsync error (Redmine#3692).
 	dup:
 	 . Make the .dup generated by ninjahelper more consistent with
 	   example.dup.
-- 
cgit v1.2.3