Merge branch 'trunk' into cloudflare_dns_driver
Conflicts:
libcloud/dns/base.py
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a43228ba
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a43228ba
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a43228ba
Branch: refs/heads/cloudflare_dns_driver
Commit: a43228ba4de6ea18d9ec281a5f402e92d58f2c00
Parents: d38e745 56548a9
Author: Tomaz Muraus <[email protected]>
Authored: Wed Nov 25 12:17:03 2015 +0100
Committer: Tomaz Muraus <[email protected]>
Committed: Wed Nov 25 12:17:03 2015 +0100
----------------------------------------------------------------------
CHANGES.rst | 8 ++
docs/developer_information.rst | 3 +
docs/upgrade_notes.rst | 15 +++-
libcloud/compute/drivers/cloudstack.py | 22 +++---
libcloud/compute/drivers/ec2.py | 80 ++++++++++++++++++++
libcloud/dns/base.py | 13 +++-
libcloud/dns/drivers/auroradns.py | 2 +-
libcloud/dns/drivers/dnsimple.py | 3 +-
libcloud/dns/drivers/durabledns.py | 2 +-
libcloud/dns/drivers/gandi.py | 1 +
libcloud/dns/drivers/google.py | 3 +-
libcloud/dns/drivers/hostvirtual.py | 7 +-
libcloud/dns/drivers/linode.py | 5 +-
libcloud/dns/drivers/pointdns.py | 3 +-
libcloud/dns/drivers/rackspace.py | 3 +-
libcloud/dns/drivers/route53.py | 9 ++-
libcloud/dns/drivers/softlayer.py | 1 +
libcloud/dns/drivers/vultr.py | 1 -
libcloud/dns/drivers/worldwidedns.py | 3 +-
libcloud/dns/drivers/zerigo.py | 2 +-
libcloud/dns/drivers/zonomi.py | 4 +-
.../ktucloud/listIpForwardingRules_default.json | 1 +
libcloud/test/compute/test_cloudstack.py | 9 +++
libcloud/test/compute/test_ec2.py | 12 +--
24 files changed, 173 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/a43228ba/libcloud/dns/base.py
----------------------------------------------------------------------
diff --cc libcloud/dns/base.py
index 4d74c15,f557c85..6e5c490
--- a/libcloud/dns/base.py
+++ b/libcloud/dns/base.py
@@@ -138,11 -143,10 +143,11 @@@ class Record(object)
return record_id
def __repr__(self):
+ zone = self.zone.domain or self.zone.id
- return ('<Record: zone=%s, name=%s, type=%s, data=%s, provider=%s '
- '...>' %
+ return ('<Record: zone=%s, name=%s, type=%s, data=%s, provider=%s, '
+ 'ttl=%s ...>' %
- (self.zone.id, self.name, self.type, self.data,
+ (zone, self.name, self.type, self.data,
- self.driver.name))
+ self.driver.name, self.ttl))
class DNSDriver(BaseDriver):
