summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-10-09 16:18:16 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-10-09 16:18:16 -0400
commit8bb2283a50771025b5a9a729f4e832211e4990ee (patch)
treedd2dd285dffe960a5fad83ac21931903ee9402bf
parent59e14fb081908f3d40eac6890cb668c088b86d92 (diff)
cleanup changelog
-rw-r--r--debian/changelog14
1 files changed, 5 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index bd503b55e..81797bc4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
git-annex (5.20150931) UNRELEASED; urgency=medium
+ * Fix a longstanding bug, where dropping a file from a remote
+ could race with other drops of the same file, and result in
+ all copies of its content being lost.
+ * git-annex-shell: Added lockcontent command, to prevent dropping of
+ a key's content. This is necessary due to the above bugfix.
* Do verification of checksums of annex objects downloaded from remotes.
* When annex objects are received into git repositories from other git
repos, their checksums are verified then too.
@@ -20,15 +25,6 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
and stop recommending bittornado | bittorrent.
* Debian: Remove dependency on transformers library, as it is now
included in ghc.
- * Fix a longstanding bug, where dropping a file from a remote
- could race with other drops of the same file, and result in
- all copies of its content being lost.
- * git-annex-shell: Added lockcontent command, to prevent dropping of
- a key's content. This is necessary due to the above bugfix.
- * When a remote uses an old version of git-annex-shell without the
- new lockcontent command, git-annex may not trust the remote enough
- to be able to drop content.
- Solution: Upgrade git-annex-shell to this version.
-- Joey Hess <id@joeyh.name> Thu, 01 Oct 2015 12:42:56 -0400