Skip to content

Sync release-0.6 branch with what is in the 0.6.2-12 RPM #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmrodri merged 3 commits into from
May 28, 2020
Merged

Sync release-0.6 branch with what is in the 0.6.2-12 RPM #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa4f40b
Update releasers for 3.11
djzager Jul 23, 2018
74ccd31
b64encode expects bytes not string
fridex Jul 30, 2018
1f2112e
Fix decode issue (#192)
muff1nman Aug 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions .tito/releasers.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion openshift/client/api_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()).decode()}
try:
return super(ApiClient, self).__deserialize(data, klass)
except AttributeError:
Expand Down