Merge lp:~fboudra/linaro-license-protection/fast-models-tab into lp:~linaro-automation/linaro-license-protection/trunk

Proposed by Fathi Boudra
Status: Merged
Approved by: Stevan Radaković
Approved revision: 219
Merged at revision: 219
Proposed branch: lp:~fboudra/linaro-license-protection/fast-models-tab
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 35 lines (+6/-3)
1 file modified
settings.py (+6/-3)
To merge this branch: bzr merge lp:~fboudra/linaro-license-protection/fast-models-tab
Reviewer Review Type Date Requested Status
Stevan Radaković Approve
Review via email: mp+187695@code.launchpad.net

Description of the change

Add Fast Models tab and rename Firmware Update to Firmware

To post a comment you must log in.
Revision history for this message
Stevan Radaković (stevanr) wrote :

Looks good to me.
Approve +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'settings.py'
--- settings.py 2013-09-17 14:43:13 +0000
+++ settings.py 2013-09-26 09:17:28 +0000
@@ -194,6 +194,7 @@
194 'INSTALL',194 'INSTALL',
195 'HACKING',195 'HACKING',
196 'FIRMWARE',196 'FIRMWARE',
197 'FASTMODELS',
197 'RTSM')198 'RTSM')
198199
199ANDROID_FILES = ('HOWTO_releasenotes.txt',200ANDROID_FILES = ('HOWTO_releasenotes.txt',
@@ -205,18 +206,20 @@
205FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',206FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
206 'HOWTO_install.txt': 'Binary Image Installation',207 'HOWTO_install.txt': 'Binary Image Installation',
207 'HOWTO_getsourceandbuild.txt': 'Building From Source',208 'HOWTO_getsourceandbuild.txt': 'Building From Source',
208 'HOWTO_flashfirmware.txt': 'Firmware Update',209 'HOWTO_flashfirmware.txt': 'Firmware',
209 'HOWTO_rtsm.txt': 'RTSM',210 'HOWTO_rtsm.txt': 'RTSM',
210 'README': 'Release Notes',211 'README': 'Release Notes',
211 'INSTALL': 'Binary Image Installation',212 'INSTALL': 'Binary Image Installation',
212 'HACKING': 'Building From Source',213 'HACKING': 'Building From Source',
213 'FIRMWARE': 'Firmware Update',214 'FIRMWARE': 'Firmware',
215 'FASTMODELS': 'Fast Models',
214 'RTSM': 'RTSM'}216 'RTSM': 'RTSM'}
215217
216TAB_PRIORITY = ['Release Notes',218TAB_PRIORITY = ['Release Notes',
217 'Binary Image Installation',219 'Binary Image Installation',
218 'Building From Source',220 'Building From Source',
219 'Firmware Update',221 'Firmware',
222 'Fast Models',
220 'RTSM']223 'RTSM']
221224
222SUPPORTED_REMOTE_STATIC_FILES = {225SUPPORTED_REMOTE_STATIC_FILES = {

Subscribers

People subscribed via source and target branches