summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-06-11 10:34:55 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-06-11 10:34:55 -0400
commit97aab7e5b8f8a86d6d05c1687ccde404518e24f4 (patch)
tree6a05ffb518fcd92e2a5fb08dae0706a866a8d7c6 /debian/changelog
parenta23a6b3c4f6c86e470b6bb3115fb8029e4d9f761 (diff)
parent928689e2c8fd6f670adafee3b46915146d108ce1 (diff)
Merge branch 'glacier'
Conflicts: debian/changelog
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index cf57b5cf3..e36b33398 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ git-annex (4.20130602) UNRELEASED; urgency=low
* webapp: When the user switches to display a different repository,
that repository becomes the default repository to be displayed next time
the webapp gets started.
+ * glacier: Better handling of the glacier inventory, which avoids
+ duplicate uploads to the same glacier repository by `git annex copy`.
-- Joey Hess <joeyh@debian.org> Mon, 10 Jun 2013 12:52:44 -0400