MAAS

Merge lp:~andreserl/maas/fix_lp1542287_1.10 into lp:maas/1.10

  1. fix_lp1542287_1.10
  2. Merge into 1.10
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4578
Proposed branch: lp:~andreserl/maas/fix_lp1542287_1.10
Merge into: lp:maas/1.10
Diff against target: 12 lines (+1/-1)
1 file modified
etc/maas/templates/commissioning-user-data/snippets/maas_signal.py (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/fix_lp1542287_1.10
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+285384@code.launchpad.net

This proposal supersedes a proposal from 2016-02-08.

Commit message

Ensure power_parms are encoded in bytes

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/maas/templates/commissioning-user-data/snippets/maas_signal.py'
2--- etc/maas/templates/commissioning-user-data/snippets/maas_signal.py 2015-12-16 14:12:14 +0000
3+++ etc/maas/templates/commissioning-user-data/snippets/maas_signal.py 2016-02-08 17:28:31 +0000
4@@ -197,7 +197,7 @@
5 power_address=address,
6 power_driver=driver
7 )
8- params[b"power_parameters"] = json.dumps(power_parms)
9+ params[b"power_parameters"] = json.dumps(power_parms).encode()
10
11 files = {}
12 for fpath in args.files:

Subscribers

People subscribed via source and target branches