Merge lp:~jtv/maas/1.5-bug-1305118 into lp:maas/1.5
Proposed by
Jeroen T. Vermeulen
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Jeroen T. Vermeulen | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2236 | ||||
Proposed branch: | lp:~jtv/maas/1.5-bug-1305118 | ||||
Merge into: | lp:maas/1.5 | ||||
Diff against target: |
26 lines (+3/-2) 2 files modified
src/provisioningserver/config.py (+1/-1) src/provisioningserver/tests/test_config.py (+2/-1) |
||||
To merge this branch: | bzr merge lp:~jtv/maas/1.5-bug-1305118 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+214975@code.launchpad.net |
Commit message
Backport trunk r2248: For the default simplestreams path, use the -v2 data, not the old data. Otherwise, the import script breaks with a KeyError on items['subarches'].
To post a comment you must log in.
Straight backport. Self-approving.