Merge lp:~smoser/maas/lp1402042 into lp:~maas-committers/maas/trunk
Proposed by
Scott Moser
Status: | Merged |
---|---|
Approved by: | Scott Moser |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4080 |
Proposed branch: | lp:~smoser/maas/lp1402042 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
118 lines (+49/-6) 2 files modified
src/provisioningserver/kernel_opts.py (+16/-3) src/provisioningserver/tests/test_kernel_opts.py (+33/-3) |
To merge this branch: | bzr merge lp:~smoser/maas/lp1402042 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+264049@code.launchpad.net |
Commit message
support using '---' as separator for copy-over kernel params
See bug 1402042 for a full description of why this change is necessary.
Description of the change
Suggestions on the variable name are welcome. I'd like to keep it consistent between maas and curtin.
To post a comment you must log in.
Looks okay but here are my suggestions for this code: http:// paste.ubuntu. com/11841389/
What do you think?