mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into s3

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-03-28 13:20:58 -04:00
commit c5fc4f3d2a
12 changed files with 317 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

16
debian/changelog vendored
View file

@ -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