diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-07-05 09:12:54 -0600 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-07-05 09:12:54 -0600 |
| commit | b0894f00c075e4dd93a692880e8eb0ea865b6c28 (patch) | |
| tree | 913802df5ed3184f83c82a846c8641719e3583a7 /debian/changelog | |
| parent | b4917bd18fa9e2eacb5fbd916828d30e2ac297b4 (diff) | |
| parent | 59f8413abe89b9abe5708fc0ab3aba93fa2c0f64 (diff) | |
Merge branch 'master' into assistant
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 33c850861..1c44f5952 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,11 @@ git-annex (3.20120630) UNRELEASED; urgency=low transfer is already in progress by another process. * status: Lists transfers that are currently in progress. * Fix passing --uuid to git-annex-shell. + * When shaNsum commands cannot be found, use the Haskell SHA library + (already a dependency) to do the checksumming. This may be slower, + but avoids portability problems. + * Use SHA library for files less than 50 kb in size, at which point it's + faster than forking the more optimised external program. -- Joey Hess <joeyh@debian.org> Sun, 01 Jul 2012 15:04:37 -0400 |