Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-10-23 16:59:26 -04:00
commit ea12d922e6
2 changed files with 22 additions and 0 deletions

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.96"
subject="comment 1"
date="2014-10-23T18:52:48Z"
content="""
The S3 library that git-annex is using does not support the authentication method that this region uses.
It is supported by the aws library that git-annex uses in the `s3-aws` branch in git, and I already added the region there this morning.
I can't merge `s3-aws` yet; the neccessary version of the aws library is not yet available in eg, Debian. And even upgrading aws from cabal seems to result in dependency hell, due to its needing a newer version of scientific. This should all sort itself out in time.
If you need this region, you'll need to try to build git-annex's s3-aws branch, for now.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.96"
subject="comment 2"
date="2014-10-23T19:51:46Z"
content="""
Looks like the cabal dependency hell is managable; if done in system without anything installed, cabal manages to install the new aws, and everything else, except for the dbus library. Still not ready to be merged though.
"""]]