Commit graph

21845 commits

Author SHA1 Message Date
Joey Hess
d0f0bd71dc add news item for git-annex 5.20141024 2014-10-24 13:35:08 -04:00
Joey Hess
5bdcb23424 prep release 2014-10-24 13:03:50 -04:00
Joey Hess
613f396efd more accurate version bounds 2014-10-24 12:11:27 -04:00
http://joeyh.name/
c7684de78e Added a comment 2014-10-24 16:02:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
23bd3564d1 Added a comment 2014-10-24 04:49:20 +00:00
Joey Hess
60bfebf37f Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-23 20:30:40 -04:00
Joey Hess
ce9076370e deal with yesod's second gratuitous rename of the same function in a year 2014-10-23 20:26:46 -04:00
Joey Hess
31a1f061c6 typo 2014-10-23 20:25:31 -04:00
http://joeyh.name/
805abd3c8d Added a comment 2014-10-23 21:05:15 +00:00
Joey Hess
2f1e6fcb73 devblog 2014-10-23 17:01:33 -04:00
Joey Hess
ea12d922e6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-23 16:59:26 -04:00
Joey Hess
8ed1a0afee fix build 2014-10-23 16:52:05 -04:00
Joey Hess
8edf7a0fc3 fix build 2014-10-23 16:51:10 -04:00
Joey Hess
c986bc67e5 add cabal flag for use with debian's older version of aws, which is now patched with the necessary stuff 2014-10-23 16:39:55 -04:00
Joey Hess
171e677a3c update for aws 0.10's better handling of DNE for HEAD
Kept support for older aws, since Debian has 0.9.2 still.
2014-10-23 16:32:18 -04:00
Joey Hess
23a4836187 Merge branch 'master' into s3-aws
Conflicts:
	Assistant/WebApp/Configurators/AWS.hs
	Remote/S3.hs
2014-10-23 15:58:18 -04:00
Joey Hess
fa1318479e rename isIA to configIA
Already done on s3-aws branch, so reduce divergence.
2014-10-23 15:56:35 -04:00
Joey Hess
6acc6863c5 fix build 2014-10-23 15:54:00 -04:00
http://joeyh.name/
9ac288d94f Added a comment 2014-10-23 19:51:46 +00:00
Joey Hess
7489f516bc one last build fix, yes it builds now 2014-10-23 15:50:41 -04:00
Joey Hess
76ee815e89 needs type families 2014-10-23 15:48:37 -04:00
Joey Hess
f0989cf0bd fix build 2014-10-23 15:41:57 -04:00
http://joeyh.name/
f8fceecd63 Added a comment 2014-10-23 18:52:49 +00:00
Joey Hess
a1fb1b7ae3 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-23 14:42:21 -04:00
Joey Hess
346f0409a6 Merge branch 'master' of ssh://git-annex.branchable.com into s3-aws 2014-10-23 14:08:34 -04:00
Joey Hess
8b48bdfdc8 enable frankfurt
The aws library supports the AWS4-HMAC-SHA256 that it requires.
2014-10-23 11:02:24 -04:00
Joey Hess
4eefc12295 Merge branch 'master' into s3-aws 2014-10-23 11:02:14 -04:00
Joey Hess
e687c61d04 add new frankfurt region to list in webapp
But commented out for now, because:

The authorization mechanism you have provided is not supported. Please use
AWS4-HMAC-SHA256
2014-10-23 11:02:02 -04:00
vorlon78
6730ed4b8d 2014-10-23 14:25:19 +00:00
Joey Hess
f5deb32e87 typo 2014-10-22 17:38:14 -04:00
http://joeyh.name/
2dd944f50e Added a comment 2014-10-22 21:36:27 +00:00
Joey Hess
35551d0ed0 Merge branch 'master' into s3-aws
Conflicts:
	Remote/S3.hs
2014-10-22 17:14:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkck-Tokgfh_1Fwh6pkl69xPA_dYUgA4Tg
0502cb9075 Added a comment 2014-10-22 19:56:23 +00:00
Joey Hess
ab57c10e10 Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-22 14:44:01 -04:00
Joey Hess
5c15d6d3cc show in info whether a remote uses hybrid encryption or not 2014-10-22 14:39:59 -04:00
http://joeyh.name/
62e00e766b Added a comment 2014-10-22 18:30:29 +00:00
Joey Hess
25574bead1 enableremote: When the remote has creds, update the local creds cache file. Before, the old version of the creds could be left there, and would continue to be used. 2014-10-22 14:28:25 -04:00
Joey Hess
3006b79c86 include creds info for glacier and webdav
That and S3 are all that uses creds currently, except that external
remotes can use creds. I have not handled showing info about external
remote creds because they can have 0, 1, or more separate cred pairs, and
there's no way for info to enumerate them or know how they're used.
So it seems ok to leave out creds info for external remotes.
2014-10-22 13:56:14 -04:00
Joey Hess
98881ffc6e Merge branch 'master' of ssh://git-annex.branchable.com 2014-10-22 13:13:42 -04:00
cehteh
9363f0fc52 fix: get, not drop for get... 2014-10-22 17:01:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmUJBh1lYmvfCCiGr3yrdx-QhuLCSRnU5c
919485694b 2014-10-22 16:25:54 +00:00
http://joeyh.name/
8425141998 Added a comment 2014-10-22 16:22:25 +00:00
http://joeyh.name/
50fef24a31 Added a comment 2014-10-22 16:18:50 +00:00
http://joeyh.name/
fb129bf97a Added a comment 2014-10-22 16:18:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE
197cc52ce0 Added a comment 2014-10-22 08:56:43 +00:00
musella
59f185c5af Added a comment 2014-10-21 23:35:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkck-Tokgfh_1Fwh6pkl69xPA_dYUgA4Tg
d2aa21b3ee Added a comment: autobuild test 2014-10-21 22:09:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkvSZ1AFJdY_1FeutZr_KWeqtzjZta1PNE
0fcf88b1a8 Added a comment 2014-10-21 21:25:57 +00:00
http://joeyh.name/
9450921d68 Added a comment 2014-10-21 20:22:52 +00:00
Joey Hess
f23e6cb146 close 2014-10-21 16:22:12 -04:00