Merge branch 'master' into database

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2015-02-17 16:15:00 -04:00
commit bd6e41f8e6
28 changed files with 428 additions and 21 deletions

1
debian/changelog vendored
View file

@ -31,6 +31,7 @@ git-annex (5.20150206) UNRELEASED; urgency=medium
* sync, assistant: Use the ssh-options git config when doing git pull
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