From aa4f40b846e4501c1eb461541e4ad0221b664fab Mon Sep 17 00:00:00 2001 From: David Zager Date: Mon, 23 Jul 2018 15:51:54 -0400 Subject: [PATCH 1/3] Update releasers for 3.11 --- .tito/releasers.conf | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.tito/releasers.conf b/.tito/releasers.conf index 66358882..2b4c815d 100644 --- a/.tito/releasers.conf +++ b/.tito/releasers.conf @@ -13,18 +13,6 @@ remote_location = http://repos.fedorapeople.org/asb/ copr_options = --timeout 600 builder.test = 1 -[asb-brew-36] +[asb-brew] releaser = tito.release.DistGitReleaser -branches = rhaos-3.6-asb-rhel-7 - -[asb-brew-37] -releaser = tito.release.DistGitReleaser -branches = rhaos-3.7-asb-rhel-7 - -[asb-brew-38] -releaser = tito.release.DistGitReleaser -branches = rhaos-3.8-asb-rhel-7 - -[asb-brew-39] -releaser = tito.release.DistGitReleaser -branches = rhaos-3.9-asb-rhel-7 +branches = rhaos-3.11-asb-rhel-7 From 74ccd31124d121d2b555bfac8d8f1cdce8855f76 Mon Sep 17 00:00:00 2001 From: Fridolin Pokorny Date: Mon, 30 Jul 2018 10:39:21 +0200 Subject: [PATCH 2/3] b64encode expects bytes not string --- openshift/client/api_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/client/api_client.py b/openshift/client/api_client.py index 2ea5706c..1d151b9b 100644 --- a/openshift/client/api_client.py +++ b/openshift/client/api_client.py @@ -11,7 +11,7 @@ class ApiClient(K8sApiClient): def _ApiClient__deserialize(self, data, klass): if klass == 'RuntimeRawExtension': - data = {'Raw': b64encode(json.dumps(data))} + data = {'Raw': b64encode(json.dumps(data).encode())} try: return super(ApiClient, self).__deserialize(data, klass) except AttributeError: From 1f2112ef1f2bc07043c179ddda83b81afc1e8aa1 Mon Sep 17 00:00:00 2001 From: Andrew DeMaria Date: Thu, 2 Aug 2018 09:08:08 -0500 Subject: [PATCH 3/3] Fix decode issue (#192) --- openshift/client/api_client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/client/api_client.py b/openshift/client/api_client.py index 1d151b9b..ec710157 100644 --- a/openshift/client/api_client.py +++ b/openshift/client/api_client.py @@ -11,7 +11,7 @@ class ApiClient(K8sApiClient): def _ApiClient__deserialize(self, data, klass): if klass == 'RuntimeRawExtension': - data = {'Raw': b64encode(json.dumps(data).encode())} + data = {'Raw': b64encode(json.dumps(data).encode()).decode()} try: return super(ApiClient, self).__deserialize(data, klass) except AttributeError: