Browse Source

Merge remote-tracking branch 'origin/master' into cloudflare-updates

pull/162/head
Ross McFarland 8 years ago
parent
commit
85af9c5f88
No known key found for this signature in database GPG Key ID: 61C10C4FC8FE4A89
2 changed files with 20 additions and 20 deletions
  1. +4
    -4
      octodns/provider/route53.py
  2. +16
    -16
      setup.cfg

+ 4
- 4
octodns/provider/route53.py View File

@ -385,10 +385,10 @@ class Route53Provider(BaseProvider):
values.append({ values.append({
'order': order, 'order': order,
'preference': preference, 'preference': preference,
'flags': flags if flags else None,
'service': service if service else None,
'regexp': regexp if regexp else None,
'replacement': replacement if replacement else None,
'flags': flags,
'service': service,
'regexp': regexp,
'replacement': replacement,
}) })
return { return {
'type': rrset['Type'], 'type': rrset['Type'],


+ 16
- 16
setup.cfg View File

@ -22,12 +22,12 @@ classifiers =
install_requires = install_requires =
PyYaml>=3.12 PyYaml>=3.12
dnspython>=1.15.0 dnspython>=1.15.0
futures==3.1.1
incf.countryutils==1.0
ipaddress==1.0.18
natsort==5.0.3
python-dateutil==2.6.1
requests==2.13.0
futures>=3.1.1
incf.countryutils>=1.0
ipaddress>=1.0.18
natsort>=5.0.3
python-dateutil>=2.6.1
requests>=2.13.0
packages = find: packages = find:
include_package_data = True include_package_data = True
@ -47,17 +47,17 @@ exclude =
dev = dev =
azure-mgmt-dns==1.0.1 azure-mgmt-dns==1.0.1
azure-common==1.1.6 azure-common==1.1.6
boto3==1.4.6
botocore==1.6.8
docutils==0.14
dyn==1.8.0
google-cloud==0.27.0
jmespath==0.9.3
boto3>=1.4.6
botocore>=1.6.8
docutils>=0.14
dyn>=1.8.0
google-cloud>=0.27.0
jmespath>=0.9.3
msrestazure==0.4.10 msrestazure==0.4.10
nsone==0.9.14
ovh==0.4.7
s3transfer==0.1.10
six==1.10.0
nsone>=0.9.14
ovh>=0.4.7
s3transfer>=0.1.10
six>=1.10.0
test = test =
coverage coverage
mock mock


Loading…
Cancel
Save