Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-21 17:12:46 -04:00
commit d82b110da8
Failed to extract signature
35 changed files with 463 additions and 71 deletions

14
debian/changelog vendored
View file

@ -17,7 +17,17 @@ git-annex (6.20151225) unstable; urgency=medium
-- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400
git-annex (5.20151209) UNRELEASED; urgency=medium
git-annex (5.20151219) UNRELEASED; urgency=medium
* status: On crippled filesystems, was displaying M for all annexed files
that were present. Probably caused by a change to what git status
displays in this situation. Fixed by treating files git thinks are
modified the same as typechanged files.
* addurl: Added --batch option.
-- Joey Hess <id@joeyh.name> Sat, 19 Dec 2015 13:31:17 -0400
git-annex (5.20151218) unstable; urgency=medium
* Add S3 features to git-annex version output.
* webdav: When testing the WebDAV server, send a file with content.
@ -28,7 +38,7 @@ git-annex (5.20151209) UNRELEASED; urgency=medium
in a corrupted git repository.
* Fix potential denial of service attack when creating temp dirs.
-- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400
-- Joey Hess <id@joeyh.name> Fri, 18 Dec 2015 12:09:33 -0400
git-annex (5.20151208) unstable; urgency=medium