Merge lp:~bladernr/checkbox/860651_redo into lp:checkbox

Proposed by Jeff Lane 
Status: Merged
Merged at revision: 1086
Proposed branch: lp:~bladernr/checkbox/860651_redo
Merge into: lp:checkbox
Diff against target: 57 lines (+6/-6)
1 file modified
jobs/mediacard.txt.in (+6/-6)
To merge this branch: bzr merge lp:~bladernr/checkbox/860651_redo
Reviewer Review Type Date Requested Status
Daniel Manrique (community) Approve
Review via email: mp+77397@code.launchpad.net

Description of the change

Reverted the biggest part of my other attempt and left this at ONLY changing the power-management/suspend_advanced deps to suspend/suspend_advanced. We can revisit moving the jobs later if necessary.

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Thanks for fixing the borked dependencies. Merging!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'jobs/mediacard.txt.in'
--- jobs/mediacard.txt.in 2011-09-08 16:52:42 +0000
+++ jobs/mediacard.txt.in 2011-09-28 19:58:15 +0000
@@ -11,7 +11,7 @@
1111
12plugin: manual12plugin: manual
13name: mediacard/sd_after_suspend13name: mediacard/sd_after_suspend
14depends: power-management/suspend_advanced mediacard/sd14depends: suspend/suspend_advanced mediacard/sd
15_description:15_description:
16 Secure Digital (SD) media card support re-verification:16 Secure Digital (SD) media card support re-verification:
17 1.- Plug a SD media card into the computer.17 1.- Plug a SD media card into the computer.
@@ -34,7 +34,7 @@
3434
35plugin: manual35plugin: manual
36name: mediacard/sdhc_after_suspend36name: mediacard/sdhc_after_suspend
37depends: power-management/suspend_advanced mediacard/sdhc37depends: suspend/suspend_advanced mediacard/sdhc
38_description:38_description:
39 Secure Digital High Capacity (SDHC) media card support re-verification:39 Secure Digital High Capacity (SDHC) media card support re-verification:
40 1.- Plug a SDHC media card into the computer.40 1.- Plug a SDHC media card into the computer.
@@ -57,7 +57,7 @@
5757
58plugin: manual58plugin: manual
59name: mediacard/mmc_after_suspend59name: mediacard/mmc_after_suspend
60depends: power-management/suspend_advanced mediacard/mmc60depends: suspend/suspend_advanced mediacard/mmc
61_description:61_description:
62 Multi Media Card (MMC) media card support re-verification:62 Multi Media Card (MMC) media card support re-verification:
63 1.- Plug a MMC media card into the computer.63 1.- Plug a MMC media card into the computer.
@@ -80,7 +80,7 @@
8080
81plugin: manual81plugin: manual
82name: mediacard/ms_after_suspend82name: mediacard/ms_after_suspend
83depends: power-management/suspend_advanced mediacard/ms83depends: suspend/suspend_advanced mediacard/ms
84_description:84_description:
85 Memory Stick (MS) media card support re-verification:85 Memory Stick (MS) media card support re-verification:
86 1.- Plug a MS media card into the computer.86 1.- Plug a MS media card into the computer.
@@ -103,7 +103,7 @@
103103
104plugin: manual104plugin: manual
105name: mediacard/msp_after_suspend105name: mediacard/msp_after_suspend
106depends: power-management/suspend_advanced mediacard/msp106depends: suspend/suspend_advanced mediacard/msp
107_description:107_description:
108 Memory Stick Pro (MSP) media card support re-verification:108 Memory Stick Pro (MSP) media card support re-verification:
109 1.- Plug a MSP media card into the computer.109 1.- Plug a MSP media card into the computer.
@@ -126,7 +126,7 @@
126126
127plugin: manual127plugin: manual
128name: mediacard/cf_after_suspend128name: mediacard/cf_after_suspend
129depends: power-management/suspend_advanced mediacard/cf129depends: suspend/suspend_advanced mediacard/cf
130_description:130_description:
131 Compact Flash (CF) media card support re-verification:131 Compact Flash (CF) media card support re-verification:
132 1.- Plug a CF media card into the computer.132 1.- Plug a CF media card into the computer.

Subscribers

People subscribed via source and target branches