Merge branch 'master' into s3-aws
Conflicts: git-annex.cabal
This commit is contained in:
commit
ef01ff1e77
128 changed files with 1219 additions and 511 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue