Merge lp:~barryprice/juju-deployer/LP1892423 into lp:juju-deployer

Proposed by Barry Price
Status: Merged
Merged at revision: 218
Proposed branch: lp:~barryprice/juju-deployer/LP1892423
Merge into: lp:juju-deployer
Diff against target: 11 lines (+1/-1)
1 file modified
deployer/deployment.py (+1/-1)
To merge this branch: bzr merge lp:~barryprice/juju-deployer/LP1892423
Reviewer Review Type Date Requested Status
juju-deployers Pending
Review via email: mp+389696@code.launchpad.net

Commit message

Apply Daniel's suggested fix for LP#1892423

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/deployment.py'
2--- deployer/deployment.py 2017-03-16 04:23:06 +0000
3+++ deployer/deployment.py 2020-08-24 02:19:26 +0000
4@@ -270,7 +270,7 @@
5 v = fh.read()
6 if include_type == "base64":
7 v = b64encode(v)
8- return v
9+ return v.encode('utf-8')
10 if feedback:
11 return feedback
12

Subscribers

People subscribed via source and target branches