Merge lp:~mpontillo/maas/fix-1517097-1.9 into lp:~maas-committers/maas/trunk
Proposed by
Mike Pontillo
Status: | Superseded |
---|---|
Proposed branch: | lp:~mpontillo/maas/fix-1517097-1.9 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
176 lines (+69/-6) (has conflicts) 4 files modified
src/provisioningserver/drivers/power/amt.py (+11/-0) src/provisioningserver/drivers/power/ipmi.py (+18/-5) src/provisioningserver/drivers/power/tests/test_amt.py (+17/-0) src/provisioningserver/drivers/power/tests/test_ipmi.py (+23/-1) Text conflict in src/provisioningserver/drivers/power/amt.py Text conflict in src/provisioningserver/drivers/power/ipmi.py Text conflict in src/provisioningserver/drivers/power/tests/test_amt.py Text conflict in src/provisioningserver/drivers/power/tests/test_ipmi.py |
To merge this branch: | bzr merge lp:~mpontillo/maas/fix-1517097-1.9 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Maintainers | Pending | ||
Review via email: mp+278230@code.launchpad.net |
This proposal has been superseded by a proposal from 2015-11-21.
Commit message
Merge fix for #1517097 from trunk revision 4512.
To post a comment you must log in.