Merge branch 'master' into relativepaths

Conflicts:
	Locations.hs
	debian/changelog
This commit is contained in:
Joey Hess 2015-01-06 19:00:01 -04:00
commit 858d776352
61 changed files with 238 additions and 122 deletions

3
debian/changelog vendored
View file

@ -18,6 +18,9 @@ git-annex (5.20141232) UNRELEASED; urgency=medium
- On Windows, this avoids some of the problems with the absurdly small
MAX_PATH of 260 bytes. In particular, git-annex repositories should
work in deeper/longer directory structures than before.
* Generate shorter keys for WORM and URL, avoiding keys that are longer
than used for SHA256, so as to not break on systems like Windows that
have very small maximum path length limits.
-- Joey Hess <id@joeyh.name> Fri, 02 Jan 2015 13:35:13 -0400