LAVA Validation Lab

Merge lp:~dpigott/lava-lab/move-ikshackbox-to-lava into lp:lava-lab

  1. move-ikshackbox-to-lava
  2. Merge into salt-states
Proposed by Dave Pigott
Status: Merged
Merged at revision: 182
Proposed branch: lp:~dpigott/lava-lab/move-ikshackbox-to-lava
Merge into: lp:lava-lab
Diff against target: 12 lines (+3/-3)
1 file modified
lava/devices/dispatcher01/production/vexpress-tc2-03.conf (+3/-3)
To merge this branch: bzr merge lp:~dpigott/lava-lab/move-ikshackbox-to-lava
Reviewer Review Type Date Requested Status
Dave Pigott Approve
Review via email: mp+170289@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Dave Pigott (dpigott) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== renamed file 'lava/devices/control/production/vexpress-tc2-03.conf' => 'lava/devices/dispatcher01/production/vexpress-tc2-03.conf'
--- lava/devices/control/production/vexpress-tc2-03.conf 2013-01-09 23:28:52 +0000
+++ lava/devices/dispatcher01/production/vexpress-tc2-03.conf 2013-06-19 10:14:27 +0000
@@ -1,6 +1,6 @@
1# DO NOT EDIT: MANAGED BY SALT!1# DO NOT EDIT: MANAGED BY SALT!
2device_type = vexpress-tc22device_type = vexpress-tc2
3reset_port_command = flock /var/lock/serial4.lock /usr/local/lab-scripts/reset-serial5000 serial4 33reset_port_command = flock /var/lock/serial3.lock /usr/local/lab-scripts/reset-serial5000 serial3 1
4connection_command = telnet serial4 70034connection_command = telnet serial3 7001
5hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu09 035hard_reset_command = /usr/local/lab-scripts/reboot-ap7952 pdu07 01
66

Subscribers

People subscribed via source and target branches