diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-28 13:20:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-28 13:20:58 -0400 |
| commit | c5fc4f3d2a38fbb4bf7ce9cecdd585b41b2767c0 (patch) | |
| tree | e4c19734617e4fe25c45a95a5c26acca71b3c470 /debian | |
| parent | 0591ecb2a108ca8d3d1cb6b649c4a2913c96b593 (diff) | |
| parent | cf99575d74d2a68004efa152ea9e7ac1c2866935 (diff) | |
Merge branch 'master' into s3
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 945a4ed6b..03a0091cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,22 @@ -git-annex (0.20110326) UNRELEASED; urgency=low +git-annex (0.20110329) UNRELEASED; urgency=low * Amazon S3 is now supported as a special type of remote. + + -- Joey Hess <joeyh@debian.org> Sat, 26 Mar 2011 14:36:16 -0400 + +git-annex (0.20110328) experimental; urgency=low + + * annex.diskreserve can be given in arbitrary units (ie "0.5 gigabytes") * Generalized remotes handling, laying groundwork for remotes that are - not regular git remotes. + not regular git remotes. (Think Amazon S3.) * Provide a less expensive version of `git annex copy --to`, enabled via --fast. This assumes that location tracking information is correct, rather than contacting the remote for every file. - * annex.diskreserve can be given in arbitrary units (ie "0.5 gigabytes") + * Bugfix: Keys could be received into v1 annexes from v2 annexes, via + v1 git-annex-shell. This results in some oddly named keys in the v1 + annex. Recognise and fix those keys when upgrading, instead of crashing. - -- Joey Hess <joeyh@debian.org> Sat, 26 Mar 2011 14:36:16 -0400 + -- Joey Hess <joeyh@debian.org> Mon, 28 Mar 2011 10:47:29 -0400 git-annex (0.20110325) experimental; urgency=low |