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

Merge branch 'master' into s3-aws

Browse source 
Conflicts:
	git-annex.cabal
This commit is contained in:
Joey Hess 2014-08-15 17:30:16 -04:00
commit ef01ff1e77
128 changed files with 1219 additions and 511 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Remote/S3.hs
View file

@ -82,7 +82,8 @@ gen r u c gc = do
localpath = Nothing,
readonly = False,
availability = GloballyAvailable,
remotetype = remote
remotetype = remote,
mkUnavailable = gen r u (M.insert "host" "!dne!" c) gc
}
s3Setup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID)