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:27 UTC
[39/50] libcloud git commit: Merge branch 'trunk' into
LIBCLOUD-781_containers
Merge branch 'trunk' into LIBCLOUD-781_containers
# Conflicts:
# CHANGES.rst
# libcloud/test/secrets.py-dist
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/104cdb15
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/104cdb15
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/104cdb15
Branch: refs/heads/trunk
Commit: 104cdb1563cdd6ce75f8b570aa4cd456782cb1ce
Parents: 223b517 ae5b069
Author: anthony-shaw <an...@gmail.com>
Authored: Mon Jan 11 10:30:34 2016 +1100
Committer: anthony-shaw <an...@gmail.com>
Committed: Mon Jan 11 10:30:34 2016 +1100
----------------------------------------------------------------------
CHANGES.rst | 17 +-
docs/development.rst | 3 +
docs/other/ssl-certificate-validation.rst | 9 +
libcloud/data/pricing.json | 260 ++++++++++---------
libcloud/dns/drivers/auroradns.py | 2 +-
libcloud/test/backup/test_dimensiondata.py | 13 +-
libcloud/test/common/test_retry_limit.py | 15 ++
libcloud/test/compute/test_dimensiondata.py | 59 ++---
libcloud/test/dns/test_auroradns.py | 63 +++++
.../test/loadbalancer/test_dimensiondata.py | 13 +-
libcloud/test/secrets.py-dist | 1 +
libcloud/utils/misc.py | 96 ++++---
12 files changed, 328 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/104cdb15/CHANGES.rst
----------------------------------------------------------------------
diff --cc CHANGES.rst
index d14076c,c5ee099..68aa8de
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@@ -7,11 -7,8 +7,13 @@@ Changes with current version of Apache
General
~~~~~~~
+- Introduction of container based drivers for Docker, Rkt and Container-as-a-service
+ providers
+ (LIBCLOUD-781, GITHUB-666)
++ [Anthony Shaw]
+
- - Introduced a Backup API driver
+ - Introduce a new ``libcloud.backup`` API for Backup as a Service projects and
+ products.
(GITHUB-621)
[Anthony Shaw]
@@@ -31,8 -33,16 +38,16 @@@ Comput
(GITHUB-664)
[Anthony Shaw]
+ DNS
+ ~~~
+
+ - Make sure ``ttl`` attribute is correctly parsed and added to the ``Record``
+ ``extra`` dictionary.
+ (GITHUB-675)
+ [Wido den Hollander]
+
Changes with Apache Libcloud 0.20.0
------------------------------------
+-------------------------------------------
General
~~~~~~~
http://git-wip-us.apache.org/repos/asf/libcloud/blob/104cdb15/libcloud/test/secrets.py-dist
----------------------------------------------------------------------
diff --cc libcloud/test/secrets.py-dist
index 608fdbd,dfc7a5b..230cef0
--- a/libcloud/test/secrets.py-dist
+++ b/libcloud/test/secrets.py-dist
@@@ -80,7 -80,4 +80,8 @@@ DNS_PARAMS_ZONOMI = ('key'
DNS_PARAMS_DURABLEDNS = ('api_user', 'api_key')
DNS_PARAMS_GODADDY = ('customer-id', 'api_user', 'api_key')
DNS_PARAMS_CLOUDFLARE = ('user@example.com', 'key')
+ DNS_PARAMS_AURORADNS = ('apikey', 'secretkey')
+
+# Container
+CONTAINER_PARAMS_DOCKER = ('user', 'password')
+CONTAINER_PARAMS_ECS = ('user', 'password', 'region')