diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-08-15 17:30:40 -0400 |
| commit | 022e81407e7d806100a0882c0f23067a88b4900a (patch) | |
| tree | b8035dc47239d6b687aa83adef0d45e11ac65969 /Remote/S3.hs | |
| parent | 52089bbe73d95c5a2c06a3c58c507129335e5580 (diff) | |
| parent | e9128138ef1e19a341d7edfda4db2d6b1f8f6b0a (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
git-annex.cabal
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 5c4111690..7c49937ce 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -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) |