Merge branch 'master' into database

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2015-02-22 14:12:07 -04:00
commit fd2a543c7d
20 changed files with 484 additions and 41 deletions

25
debian/changelog vendored
View file

@ -1,4 +1,16 @@
git-annex (5.20150206) UNRELEASED; urgency=medium
git-annex (5.2015022) UNRELEASED; urgency=medium
* fsck: Incremental fsck uses sqlite to store its records, instead
of abusing the sticky bit. Existing sticky bits are ignored;
incremental fscks started by old versions won't be resumed by
this version.
* fsck: Multiple incremental fscks of different repos (including remotes)
can now be running at the same time in the same repo without it
getting confused about which files have been checked for which remotes.
-- Joey Hess <id@joeyh.name> Thu, 19 Feb 2015 14:16:03 -0400
git-annex (5.20150219) unstable; urgency=medium
* glacier: Detect when the glacier command in PATH is the wrong one,
from boto, rather than from glacier-cli, and refuse to use it,
@ -21,7 +33,7 @@ git-annex (5.20150206) UNRELEASED; urgency=medium
* addurl: Avoid crash if quvi is not installed, when git-annex was
built with process-1.2
* bittorrent: Fix mojibake introduced in parsing arai2c progress output.
* fsck --from: If a download from a remote fails, propigate the failure.
* fsck --from: If a download from a remote fails, propagate the failure.
* metadata: When setting metadata, do not recurse into directories by
default, since that can be surprising behavior and difficult to recover
from. The old behavior is available by using --force.
@ -32,15 +44,8 @@ git-annex (5.20150206) UNRELEASED; urgency=medium
and push.
* remotedaemon: Use the ssh-options git config.
* Linux standalone: Improved process names of linker shimmed programs.
* fsck: Incremental fsck uses sqlite to store its records, instead
of abusing the sticky bit. Existing sticky bits are ignored,
incremental fscks started by old versions won't be resumed by
this version.
* fsck: Multiple incremental fscks of different repos (some remote)
can now be in progress at the same time in the same repo without it
getting confused about which files have been checked for which remotes.
-- Joey Hess <id@joeyh.name> Fri, 06 Feb 2015 13:57:08 -0400
-- Joey Hess <id@joeyh.name> Thu, 19 Feb 2015 14:16:03 -0400
git-annex (5.20150205) unstable; urgency=medium