summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-06-13 21:53:43 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-06-13 21:53:43 -0400
commit223e1724628178db6ea43b1d87f54dbdcb76cb61 (patch)
tree4b7e598c447ae77241808fbedd8ca0fa13583019 /CHANGELOG
parentfcf653c9e04fdf9f29b597a2d239e49bcfbc33fc (diff)
merged patch
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index dcdcbbfc9..8612412fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+git-annex (6.20160614) UNRELEASED; urgency=medium
+
+ * Webapp: Don't allow deleting a remote that has syncing disabled,
+ as such a deletion will never finish.
+ Thanks, Farhan Kathawala.
+
+ -- Joey Hess <id@joeyh.name> Mon, 13 Jun 2016 21:52:24 -0400
+
git-annex (6.20160613) unstable; urgency=medium
* Improve SHA*E extension extraction code.