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

Proposed by Andres Rodriguez
Status: Superseded
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
MAAS Committers Pending
Review via email: mp+285381@code.launchpad.net

This proposal has been superseded by a proposal from 2016-02-08.

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 '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:37:09 +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