LAVA Dispatcher

Merge lp://staging/~qzhang/lava-dispatcher/fix-917221 into lp://staging/lava-dispatcher

fix-917221
Merge into trunk

Proposed by Spring Zhang on 2012-01-16

Status:

Merged

Merged at revision:

194

Proposed branch:

lp://staging/~qzhang/lava-dispatcher/fix-917221

Merge into:

lp://staging/lava-dispatcher

Diff against target:

23 lines (+3/-3)

1 file modified

lava_dispatcher/default-config/lava-dispatcher/device-defaults.conf (+3/-3)

To merge this branch:

bzr merge lp://staging/~qzhang/lava-dispatcher/fix-917221

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Paul Larson (community)		2012-01-16	Approve on 2012-01-18
Review via email: mp+88724@code.staging.launchpad.net

Description of the change

In case new test image can't be recognized, remove ':' in tester_str config.

Revision history for this message

Zygmunt Krynicki (zyga) wrote on 2012-01-16:

Hi Spring

7 # Master image recognization string
8 -MASTER_STR = root@master:
9 +MASTER_STR = root@master
10
11 # Test image recognization string
12 -TESTER_STR = root@linaro:
13 +TESTER_STR = root@linaro

The part above looks good.

20 # The value to pass to qemu-system-arm's -M option.
21 -qemu_machine_type = %(device_type)s
22 \ No newline at end of file
23 +qemu_machine_type = %(device_type)s

Is this part relevant?

Revision history for this message

Spring Zhang (qzhang) wrote on 2012-01-17:

> Hi Spring
>
> 7 # Master image recognization string
> 8 -MASTER_STR = root@master:
> 9 +MASTER_STR = root@master
> 10
> 11 # Test image recognization string
> 12 -TESTER_STR = root@linaro:
> 13 +TESTER_STR = root@linaro
>
> The part above looks good.
>
> 20 # The value to pass to qemu-system-arm's -M option.
> 21 -qemu_machine_type = %(device_type)s
> 22 \ No newline at end of file
> 23 +qemu_machine_type = %(device_type)s
>
> Is this part relevant?
No, I didn't even notice it, it is caused by the previous file is "No \n at the end of file", after I save it in vim, it has a newline.