Merge lp:~andreserl/maas/maas_saucy_fix_commissioning into lp:maas/trunk
Status: | Merged |
---|---|
Approved by: | Andres Rodriguez on 2013-10-09 |
Approved revision: | 1694 |
Merged at revision: | 1693 |
Proposed branch: | lp:~andreserl/maas/maas_saucy_fix_commissioning |
Merge into: | lp:maas/trunk |
Diff against target: |
33 lines (+10/-2) 2 files modified
src/metadataserver/models/commissioningscript.py (+5/-0) src/metadataserver/models/tests/test_commissioningscript.py (+5/-2) |
To merge this branch: | bzr merge lp:~andreserl/maas/maas_saucy_fix_commissioning |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve on 2013-10-09 | ||
Raphaël Badin (community) | Approve on 2013-10-09 | ||
Gavin Panella (community) | 2013-10-09 | Approve on 2013-10-09 | |
Review via email:
|
Commit message
Fix commissioning by reload initctl configuration in order to make sure that the lldpd init script is available before restart, otherwise # it might cause commissioning to fail. This is due bug # (LP: #882147) in the kernel.
MAAS Lander (maas-lander) wrote : | # |
The attempt to merge lp:~andreserl/maas/maas_saucy_fix_commissioning into lp:maas failed. Below is the output from the failed tests.
Ign http://
Ign http://
Hit http://
Ign http://
Hit http://
Get:1 http://
Hit http://
Get:2 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:3 http://
Ign http://
Ign http://
Get:4 http://
Get:5 http://
Get:6 http://
Hit http://
Get:7 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Ign http://
Ign http://
Fetched 18.0 MB in 8s (2,061 kB/s)
Reading package lists...
sudo DEBIAN_
--
Raphaël Badin (rvb) wrote : | # |
I just tested this fix in the lab… and it worked \o/. Well done Andres!
Raphaël Badin (rvb) wrote : | # |
Btw, you need to fix the related test with something like http://
- 1694. By Andres Rodriguez on 2013-10-09
-
update test
Tip top, nicely sleuthed.