Merge lp:~gesha/linaro-license-protection/configs-change-mandatory-files into lp:linaro-license-protection/configs

Proposed by Georgy Redkozubov
Status: Merged
Merged at revision: 25
Proposed branch: lp:~gesha/linaro-license-protection/configs-change-mandatory-files
Merge into: lp:linaro-license-protection/configs
Diff against target: 27 lines (+2/-4)
2 files modified
django/settings_releases.py (+1/-2)
django/settings_snapshots.py (+1/-2)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/configs-change-mandatory-files
Reviewer Review Type Date Requested Status
Fathi Boudra Approve
Review via email: mp+130997@code.launchpad.net

Description of the change

This branch remove HOWOTO_flashfirmware.txt from mandatory files. It will be shown only when file is available whithout fallback to wiki.

To post a comment you must log in.
Revision history for this message
Fathi Boudra (fboudra) wrote :

ship it!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'django/settings_releases.py'
--- django/settings_releases.py 2012-10-23 09:35:17 +0000
+++ django/settings_releases.py 2012-10-23 13:22:33 +0000
@@ -36,8 +36,7 @@
36 'HOWTO_rtsm.txt')36 'HOWTO_rtsm.txt')
3737
38MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',38MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',
39 'HOWTO_getsourceandbuild.txt',39 'HOWTO_getsourceandbuild.txt')
40 'HOWTO_flashfirmware.txt')
4140
42FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',41FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
43 'HOWTO_install.txt': 'Binary Image Installation',42 'HOWTO_install.txt': 'Binary Image Installation',
4443
=== modified file 'django/settings_snapshots.py'
--- django/settings_snapshots.py 2012-10-23 09:35:17 +0000
+++ django/settings_snapshots.py 2012-10-23 13:22:33 +0000
@@ -36,8 +36,7 @@
36 'HOWTO_rtsm.txt')36 'HOWTO_rtsm.txt')
3737
38MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',38MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',
39 'HOWTO_getsourceandbuild.txt',39 'HOWTO_getsourceandbuild.txt')
40 'HOWTO_flashfirmware.txt')
4140
42FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',41FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
43 'HOWTO_install.txt': 'Binary Image Installation',42 'HOWTO_install.txt': 'Binary Image Installation',

Subscribers

People subscribed via source and target branches