Merge lp:~newell-jensen/maas/1.5-bug-1373580 into lp:maas/1.5
Status: | Merged |
---|---|
Approved by: | Newell Jensen on 2014-09-30 |
Approved revision: | 2297 |
Merged at revision: | 2298 |
Proposed branch: | lp:~newell-jensen/maas/1.5-bug-1373580 |
Merge into: | lp:maas/1.5 |
Diff against target: |
13 lines (+2/-1) 1 file modified
src/provisioningserver/drivers/hardware/mscm.py (+2/-1) |
To merge this branch: | bzr merge lp:~newell-jensen/maas/1.5-bug-1373580 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Newell Jensen (community) | Approve on 2014-09-30 | ||
Review via email:
|
Commit message
Backport trunk r3080: Setting default cartridge to amd64/generic and adding ProLiant m700 Server Cartridge to the cartridge mapping.
MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~newell-jensen/maas/1.5-bug-1373580 into lp:maas/1.5 failed. Below is the output from the failed tests.
Ign http://
Get:1 http://
Ign http://
Get:2 http://
Ign http://
Hit http://
Get:3 http://
Hit http://
Get:4 http://
Get:5 http://
Hit http://
Get:6 http://
Hit http://
Get:7 http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:8 http://
Get:9 http://
Get:10 http://
Ign http://
Ign http://
Get:11 http://
Get:12 http://
Get:13 http://
Get:14 http://
Get:15 http://
Get:16 http://
Fetched 1,461 kB in 0s (1,925 kB/s)
Reading package lists...
sudo DEBIAN_
--
Backport self-review.