Merge branch 'master' into s3-aws

This commit is contained in:
Joey Hess 2014-08-09 13:40:21 -04:00
commit 8eac9eab03
22 changed files with 324 additions and 28 deletions

2
debian/changelog vendored
View file

@ -29,6 +29,8 @@ git-annex (5.20140718) UNRELEASED; urgency=medium
* Dropping an object from a bup special remote now deletes the git branch
for the object, although of course the object's content cannot be deleted
due to the nature of bup.
* unlock: Better error handling; continue past files that are not available
or cannot be unlocked due to disk space, and try all specified files.
-- Joey Hess <joeyh@debian.org> Mon, 21 Jul 2014 14:41:26 -0400