Merge pull request #514 from denverdino/master

Storage Driver for Aliyun OSS
This commit is contained in:
Aaron Lehmann 2015-08-04 12:01:02 -07:00
commit 3a414deddb
26 changed files with 3982 additions and 1 deletions

View file

@ -21,7 +21,7 @@ machine:
BASE_OLD: ../../../$HOME/.gvm/pkgsets/old/global/$BASE_DIR
BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR
# BASE_BLEED: ../../../$HOME/.gvm/pkgsets/bleed/global/$BASE_DIR
DOCKER_BUILDTAGS: "include_rados"
DOCKER_BUILDTAGS: "include_rados include_oss"
# Workaround Circle parsing dumb bugs and/or YAML wonkyness
CIRCLE_PAIN: "mode: set"
# Ceph config