From 0af455049ae96f8faba2043d121d256f26bdfb4d Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Tue, 27 Sep 2022 07:18:17 -0700 Subject: [PATCH 1/2] Remove master mentions from README --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 788619f..1bbad7e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -OctoDNS Logo +OctoDNS Logo ## DNS as code - Tools for managing DNS across multiple providers @@ -178,7 +178,7 @@ After the reviews it's time to branch deploy the change. ![Output of a deployment command](/docs/assets/deploy.png) -If that goes smoothly, you again see the expected changes, and verify them with `dig` and/or `octodns-report` you're good to hit the merge button. If there are problems you can quickly do a `.deploy dns/master` to go back to the previous state. +If that goes smoothly, you again see the expected changes, and verify them with `dig` and/or `octodns-report` you're good to hit the merge button. If there are problems you can quickly do a `.deploy dns/main` to go back to the previous state. ### Bootstrapping config files @@ -378,7 +378,7 @@ If you know of any other resources, please do let us know! OctoDNS is licensed under the [MIT license](LICENSE). -The MIT license grant is not for GitHub's trademarks, which include the logo designs. GitHub reserves all trademark and copyright rights in and to all GitHub trademarks. GitHub's logos include, for instance, the stylized designs that include "logo" in the file title in the following folder: https://github.com/octodns/octodns/tree/master/docs/logos/ +The MIT license grant is not for GitHub's trademarks, which include the logo designs. GitHub reserves all trademark and copyright rights in and to all GitHub trademarks. GitHub's logos include, for instance, the stylized designs that include "logo" in the file title in the following folder: https://github.com/octodns/octodns/tree/main/docs/logos/ GitHub® and its stylized versions and the Invertocat mark are GitHub's Trademarks or registered Trademarks. When using GitHub's logos, be sure to follow the GitHub logo guidelines. From 2a3eb2475969c1abf3c2c2e9968aa595759af5e7 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Tue, 27 Sep 2022 07:18:47 -0700 Subject: [PATCH 2/2] Remove stray pprint --- tests/test_octodns_manager.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/test_octodns_manager.py b/tests/test_octodns_manager.py index 1a36723..abcf9a7 100644 --- a/tests/test_octodns_manager.py +++ b/tests/test_octodns_manager.py @@ -186,9 +186,6 @@ class TestManager(TestCase): manager.config['zones'] = manager._config_zones( {'déjà.vu.': {}, 'deja.vu.': {}, idna_encode('こんにちは.jp.'): {}} ) - from pprint import pprint - - pprint(manager.config['zones']) # refer to them with utf-8 with self.assertRaises(ManagerException) as ctx: