libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [4/4] libcloud git commit: Resolve merge conflicts Closes #742
Date Tue, 12 Apr 2016 22:41:08 GMT
Resolve merge conflicts
Closes #742


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7b0fc64d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7b0fc64d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7b0fc64d

Branch: refs/heads/trunk
Commit: 7b0fc64d48fc938a44e691a792c4ac5d02438f94
Parents: 440f531
Author: anthony-shaw <anthony.p.shaw@gmail.com>
Authored: Wed Apr 13 08:39:47 2016 +1000
Committer: anthony-shaw <anthony.p.shaw@gmail.com>
Committed: Wed Apr 13 08:40:33 2016 +1000

----------------------------------------------------------------------
 libcloud/dns/providers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/7b0fc64d/libcloud/dns/providers.py
----------------------------------------------------------------------
diff --git a/libcloud/dns/providers.py b/libcloud/dns/providers.py
index 21871a2..ad55385 100644
--- a/libcloud/dns/providers.py
+++ b/libcloud/dns/providers.py
@@ -71,7 +71,8 @@ DRIVERS = {
     ('libcloud.dns.drivers.nsone', 'NsOneDNSDriver'),
     Provider.LUADNS:
     ('libcloud.dns.drivers.luadns', 'LuadnsDNSDriver'),
-
+    Provider.BUDDYNS:
+    ('libcloud.dns.drivers.buddyns', 'BuddyNSDNSDriver'),
 
     # Deprecated
     Provider.RACKSPACE_US:


Mime
View raw message