You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/01/20 04:44:37 UTC
[49/50] libcloud git commit: Merge branch 'trunk' into
LIBCLOUD-781_containers
Merge branch 'trunk' into LIBCLOUD-781_containers
# Conflicts:
# .travis.yml
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/65bc1ddf
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/65bc1ddf
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/65bc1ddf
Branch: refs/heads/trunk
Commit: 65bc1ddff16a6a229d30cf839f753abe60340a4b
Parents: c8c6c2f 99d6bce
Author: anthony-shaw <an...@gmail.com>
Authored: Wed Jan 20 10:15:08 2016 +1100
Committer: anthony-shaw <an...@gmail.com>
Committed: Wed Jan 20 10:15:08 2016 +1100
----------------------------------------------------------------------
.travis.yml | 13 +-
CHANGES.rst | 21 +
contrib/scrape-ec2-prices.py | 2 +
.../_static/images/provider_logos/backblaze.png | Bin 0 -> 6864 bytes
docs/dns/drivers/auroradns.rst | 19 +
.../dns/auroradns/enable_disable_record.py | 2 +-
docs/examples/dns/auroradns/health_checks.py | 21 +
.../storage/backblaze_b2/instantiate.py | 8 +
docs/other/ssl-certificate-validation.rst | 43 ++
docs/storage/_supported_methods_cdn.rst | 2 +
docs/storage/_supported_methods_main.rst | 2 +
docs/storage/_supported_providers.rst | 2 +
docs/storage/drivers/auroraobjects.rst | 3 -
docs/storage/drivers/backblaze_b2.rst | 40 ++
libcloud/compute/drivers/ec2.py | 42 ++
libcloud/data/pricing.json | 34 +-
libcloud/dns/drivers/auroradns.py | 385 +++++++++++++++-
libcloud/httplib_ssl.py | 68 ++-
libcloud/storage/drivers/backblaze_b2.py | 462 +++++++++++++++++++
libcloud/storage/providers.py | 2 +
libcloud/storage/types.py | 1 +
.../dns/fixtures/auroradns/zone_create.json | 11 +
.../fixtures/auroradns/zone_example_com.json | 11 +
.../zone_example_com_health_check.json | 14 +
.../zone_example_com_health_checks.json | 44 ++
.../zone_example_com_record_localhost.json | 12 +
.../auroradns/zone_example_com_records.json | 38 ++
.../test/dns/fixtures/auroradns/zone_list.json | 24 +
libcloud/test/dns/test_auroradns.py | 231 +++++++++-
.../fixtures/backblaze_b2/b2_create_bucket.json | 6 +
.../fixtures/backblaze_b2/b2_delete_bucket.json | 6 +
.../backblaze_b2/b2_delete_file_version.json | 4 +
.../backblaze_b2/b2_get_upload_url.json | 5 +
.../fixtures/backblaze_b2/b2_hide_file.json | 7 +
.../fixtures/backblaze_b2/b2_list_buckets.json | 22 +
.../backblaze_b2/b2_list_file_names.json | 34 ++
.../backblaze_b2/b2_list_file_versions.json | 69 +++
.../fixtures/backblaze_b2/b2_upload_file.json | 10 +
libcloud/test/storage/test_backblaze_b2.py | 213 +++++++++
libcloud/test/test_httplib_ssl.py | 37 ++
40 files changed, 1915 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/65bc1ddf/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index af0690d,a48465f..5a635be
--- a/.travis.yml
+++ b/.travis.yml
@@@ -8,27 -8,26 +8,28 @@@ python
- 3.4
- 3.5
- "pypy"
-sudo: false
os:
- linux
- - osx
+ # Note: OS X has been broken on Travis for a long time
+ #- osx
env:
matrix:
fast_finish: true
-- allow_failures:
-- - os: osx
include:
- - python: 2.7
+ - sudo: required
+ python: 2.7
env: ENV=lint
before_script: TOX_ENV=lint
- - python: 2.7
+ - sudo: required
+ python: 2.7
env: ENV=docs
before_script: TOX_ENV=docs-travis
+ before_install:
+ - sudo apt-get update -qq
+ - sudo apt-get install -y graphviz
+ # Trigger ReadTheDocs build
+ after_success: ./contrib/trigger_rtd_build.py 8284
install:
- TOX_ENV=py$TRAVIS_PYTHON_VERSION
http://git-wip-us.apache.org/repos/asf/libcloud/blob/65bc1ddf/CHANGES.rst
----------------------------------------------------------------------
diff --cc CHANGES.rst
index 68aa8de,a6fffb3..4cbf09f
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -46,8 -58,12 +63,12 @@@ DN
(GITHUB-675)
[Wido den Hollander]
+ - Improve unit tests of Aurora DNS driver
+ (GITHUB-679)
+ [Wido den Hollander]
+
Changes with Apache Libcloud 0.20.0
------------------------------------
+-------------------------------------------
General
~~~~~~~