linaro-license-protection

Merge lp:~stevanr/linaro-license-protection/bug-1069814-configs into lp:linaro-license-protection/configs

  1. bug-1069814-configs
  2. Merge into configs
Proposed by Stevan Radaković
Status: Merged
Approved by: Georgy Redkozubov
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~stevanr/linaro-license-protection/bug-1069814-configs
Merge into: lp:linaro-license-protection/configs
Diff against target: 81 lines (+66/-0)
2 files modified
django/settings_releases.py (+33/-0)
django/settings_snapshots.py (+33/-0)
To merge this branch: bzr merge lp:~stevanr/linaro-license-protection/bug-1069814-configs
Reviewer Review Type Date Requested Status
Georgy Redkozubov Approve
Linaro Infrastructure Pending
Review via email: mp+130884@code.launchpad.net

Description of the change

Update textile README file extension for releases.

To post a comment you must log in.
Revision history for this message
Georgy Redkozubov (gesha) wrote :

Looks good, one comment, I guess we should add the same to settings_staging_releases.py

review: Approve
lp:~stevanr/linaro-license-protection/bug-1069814-configs updated
25. By Stevan Radaković

Apply changes from code review fixes.

Revision history for this message
Georgy Redkozubov (gesha) wrote :

Please update configs for staging server otherwise we'll get errors running app on staging instances.

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-08-23 16:40:00 +0000
+++ django/settings_releases.py 2012-10-23 09:40:26 +0000
@@ -22,3 +22,36 @@
22 os.path.join(PROJECT_ROOT, "templates" ),22 os.path.join(PROJECT_ROOT, "templates" ),
23 )23 )
24SERVED_PATHS = ['/srv/releases.linaro.org/www']24SERVED_PATHS = ['/srv/releases.linaro.org/www']
25
26# Render TEXTILE files settings.
27LINUX_FILES = ('README.textile',
28 'INSTALL',
29 'HACKING',
30 'FIRMWARE',
31 'RTSM')
32ANDROID_FILES = ('HOWTO_releasenotes.txt',
33 'HOWTO_install.txt',
34 'HOWTO_getsourceandbuild.txt',
35 'HOWTO_flashfirmware.txt',
36 'HOWTO_rtsm.txt')
37
38MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',
39 'HOWTO_getsourceandbuild.txt',
40 'HOWTO_flashfirmware.txt')
41
42FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
43 'HOWTO_install.txt': 'Binary Image Installation',
44 'HOWTO_getsourceandbuild.txt': 'Building From Source',
45 'HOWTO_flashfirmware.txt': 'Firmware Update',
46 'HOWTO_rtsm.txt': 'RTSM',
47 'README.textile': 'Release Notes',
48 'INSTALL': 'Binary Image Installation',
49 'HACKING': 'Building From Source',
50 'FIRMWARE': 'Firmware Update',
51 'RTSM': 'RTSM'}
52
53TAB_PRIORITY = ['Release Notes',
54 'Binary Image Installation',
55 'Building From Source',
56 'Firmware Update',
57 'RTSM']
2558
=== modified file 'django/settings_snapshots.py'
--- django/settings_snapshots.py 2012-08-23 16:40:00 +0000
+++ django/settings_snapshots.py 2012-10-23 09:40:26 +0000
@@ -22,3 +22,36 @@
22 os.path.join(PROJECT_ROOT, "templates" ),22 os.path.join(PROJECT_ROOT, "templates" ),
23 )23 )
24SERVED_PATHS = ['/srv/snapshots.linaro.org/www']24SERVED_PATHS = ['/srv/snapshots.linaro.org/www']
25
26# Render TEXTILE files settings.
27LINUX_FILES = ('README',
28 'INSTALL',
29 'HACKING',
30 'FIRMWARE',
31 'RTSM')
32ANDROID_FILES = ('HOWTO_releasenotes.txt',
33 'HOWTO_install.txt',
34 'HOWTO_getsourceandbuild.txt',
35 'HOWTO_flashfirmware.txt',
36 'HOWTO_rtsm.txt')
37
38MANDATORY_ANDROID_FILES = ('HOWTO_install.txt',
39 'HOWTO_getsourceandbuild.txt',
40 'HOWTO_flashfirmware.txt')
41
42FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
43 'HOWTO_install.txt': 'Binary Image Installation',
44 'HOWTO_getsourceandbuild.txt': 'Building From Source',
45 'HOWTO_flashfirmware.txt': 'Firmware Update',
46 'HOWTO_rtsm.txt': 'RTSM',
47 'README': 'Release Notes',
48 'INSTALL': 'Binary Image Installation',
49 'HACKING': 'Building From Source',
50 'FIRMWARE': 'Firmware Update',
51 'RTSM': 'RTSM'}
52
53TAB_PRIORITY = ['Release Notes',
54 'Binary Image Installation',
55 'Building From Source',
56 'Firmware Update',
57 'RTSM']

Subscribers

People subscribed via source and target branches