lp://qastaging/~nick-schutt/lava-dispatcher/nicks-bootloader-interactive

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://qastaging/lava-dispatcher

Linaro Validation Team: Pending requested 2013-05-22

Diff: 863 lines (+365/-126) (has conflicts)

12 files modified

lava_dispatcher/actions/deploy.py (+6/-3)
lava_dispatcher/client/network_master.py (+149/-0)
lava_dispatcher/client/targetdevice.py (+5/-5)
lava_dispatcher/config.py (+1/-0)
lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf (+8/-3)
lava_dispatcher/default-config/lava-dispatcher/device-types/highbank.conf (+26/-0)
lava_dispatcher/device/fastmodel.py (+2/-2)
lava_dispatcher/device/highbank.py (+71/-64)
lava_dispatcher/device/master.py (+88/-42)
lava_dispatcher/device/qemu.py (+2/-2)
lava_dispatcher/device/sdmux.py (+2/-2)
lava_dispatcher/device/target.py (+5/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

637. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

636. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

635. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

634. By Nicholas Schutt on 2013-05-03

remove boot_cmds from highbank config (the image takes care of this)

633. By Nicholas Schutt on 2013-05-03

merge trunk

632. By Nicholas Schutt on 2013-05-03

read file and strip newlines in one line

631. By Nicholas Schutt on 2013-05-03

read file and strip newlines in one line

630. By Nicholas Schutt on 2013-05-03

map lines without sendline/expect keyword as sendline for backward compatability

629. By Nicholas Schutt on 2013-05-03

debug boot_cmds

628. By Nicholas Schutt on 2013-05-03

remove carriage returns from boot commands file