From: Andre Noll <maan@tuebingen.mpg.de>
Date: Wed, 25 Feb 2015 12:23:56 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/max-errors'
X-Git-Tag: v0.1.6~5
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=90e4077abd237cfd03def4ea023a70ccd9167bcf

Merge branch 'refs/heads/t/max-errors'

The topic branch was cooking for about a week, and it was tested with
no problems on several multi-terabyte file systems.

	* Rework restart logic, introduce --max-errors.
	* Fix typo in help text of --daemon.
---

90e4077abd237cfd03def4ea023a70ccd9167bcf
diff --cc NEWS
index db77b45,db77b45..444c12e
--- a/NEWS
+++ b/NEWS
@@@ -2,8 -2,8 +2,13 @@@
  0.1.6 (to be announced)
  -----------------------
  
--- New option --min-complete
--- New home page URL, email address
++ - New option --min-complete to specify the minimal number of snapshots
++   to keep.
++
++ - Improved handling of rsync errors. The new --max-rsync-errors option
++ tells dss to terminate after the given number of rsync failures.
++
++ - New home page URL, email address
  
  ------------------
  0.1.5 (2014-01-14)