Merge branch 'resume_missing'

digint · Apr 1, 2015 · 2a65895 · 2a65895
2 parents be6547c + 10b8983
commit 2a65895
Show file tree

Hide file tree

Showing 6 changed files with 229 additions and 67 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -24,5 +24,9 @@
 * btrbk-current
   - added configuration option "btrfs_progs_compat", to be enabled if
     using btrfs-progs < 3.17. Fixes issue #6
+  - added configuration option "resume_missing", for automatic resume
+    of missing backups
   - removed configuration option "receive_log" in favor of printing
     errors from "btrfs receive"
+  - bugfix: show correct exit code on external command failure
+  - bugfix: no crash if "commit_delete" option is set to "no"
diff --git a/README.md b/README.md
@@ -14,9 +14,10 @@ Key Features:
 
 - Atomic snapshots
 - Incremental backups
+- Configurable retention policy
 - Backups to multiple destinations
 - Transfer via ssh
-- Configurable retention policy
+- Resume of backups (if backup disk was not attached for a while)
 - Display file changes between two backups
 
 btrbk is intended to be run as a cron job.