Merge branch 'master' into fastdns-edgedns-rename

6 years ago · e52429e31b
--- a/requirements.txt
+++ b/requirements.txt
@ -23,4 +23,4 @@ requests==2.23.0
 s3transfer==0.3.3
 setuptools==44.0.0
 six==1.14.0
 transip==2.0.0
 transip==2.1.1
--- a/tests/test_octodns_provider_transip.py
+++ b/tests/test_octodns_provider_transip.py
@ -99,6 +99,7 @@ class MockDomainService(DomainService):


 class TestTransipProvider(TestCase):

    bogus_key = str("""-----BEGIN RSA PRIVATE KEY-----
 MIIEowIBAAKCAQEA0U5HGCkLrz423IyUf3u4cKN2WrNz1x5KNr6PvH2M/zxas+zB
 elbxkdT3AQ+wmfcIvOuTmFRTHv35q2um1aBrPxVw+2s+lWo28VwIRttwIB1vIeWu