linaro-license-protection

Merge lp:~gesha/linaro-license-protection/configs-1246428 into lp:linaro-license-protection/configs

  1. configs-1246428
  2. Merge into configs
Proposed by Georgy Redkozubov
Status: Merged
Approved by: Milo Casagrande
Approved revision: 36
Merged at revision: 36
Proposed branch: lp:~gesha/linaro-license-protection/configs-1246428
Merge into: lp:linaro-license-protection/configs
Diff against target: 100 lines (+26/-18)
3 files modified
django/settings_releases.py (+6/-3)
django/settings_snapshots.py (+16/-13)
django/settings_staging_releases.py (+4/-2)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/configs-1246428
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Review via email: mp+193506@code.launchpad.net

Description of the change

This branch adds new 'OpenJDK' tab.
Fixes names for textile files on snapshots.

To post a comment you must log in.
Revision history for this message
Milo Casagrande (milo) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'django/settings_releases.py'
2--- django/settings_releases.py 2013-09-26 11:11:12 +0000
3+++ django/settings_releases.py 2013-10-31 22:00:59 +0000
4@@ -31,7 +31,8 @@
5 'HACKING.textile',
6 'FIRMWARE.textile',
7 'FASTMODELS.textile',
8- 'RTSM.textile')
9+ 'RTSM.textile',
10+ 'OPENJDK.textile')
11
12 ANDROID_FILES = ('HOWTO_releasenotes.txt',
13 'HOWTO_install.txt',
14@@ -49,11 +50,13 @@
15 'HACKING.textile': 'Building From Source',
16 'FIRMWARE.textile': 'Firmware',
17 'FASTMODELS.textile': 'Fast Models',
18- 'RTSM.textile': 'RTSM'}
19+ 'RTSM.textile': 'RTSM',
20+ 'OPENJDK.textile': 'OpenJDK'}
21
22 TAB_PRIORITY = ['Release Notes',
23 'Binary Image Installation',
24 'Building From Source',
25 'Firmware',
26 'Fast Models',
27- 'RTSM']
28+ 'RTSM',
29+ 'OpenJDK']
30
31=== modified file 'django/settings_snapshots.py'
32--- django/settings_snapshots.py 2013-09-26 11:11:12 +0000
33+++ django/settings_snapshots.py 2013-10-31 22:00:59 +0000
34@@ -26,12 +26,13 @@
35 UPLOAD_PATH = '/srv/snapshots.linaro.org/uploads'
36
37 # Render TEXTILE files settings.
38-LINUX_FILES = ('README',
39- 'INSTALL',
40- 'HACKING',
41- 'FIRMWARE',
42- 'FASTMODELS',
43- 'RTSM')
44+LINUX_FILES = ('README.textile',
45+ 'INSTALL.textile',
46+ 'HACKING.textile',
47+ 'FIRMWARE.textile',
48+ 'FASTMODELS.textile',
49+ 'RTSM.textile',
50+ 'OPENJDK.textile')
51
52 ANDROID_FILES = ('HOWTO_releasenotes.txt',
53 'HOWTO_install.txt',
54@@ -44,16 +45,18 @@
55 'HOWTO_getsourceandbuild.txt': 'Building From Source',
56 'HOWTO_flashfirmware.txt': 'Firmware',
57 'HOWTO_rtsm.txt': 'RTSM',
58- 'README': 'Release Notes',
59- 'INSTALL': 'Binary Image Installation',
60- 'HACKING': 'Building From Source',
61- 'FIRMWARE': 'Firmware',
62- 'FASTMODELS': 'Fast Models',
63- 'RTSM': 'RTSM'}
64+ 'README.textile': 'Release Notes',
65+ 'INSTALL.textile': 'Binary Image Installation',
66+ 'HACKING.textile': 'Building From Source',
67+ 'FIRMWARE.textile': 'Firmware',
68+ 'FASTMODELS.textile': 'Fast Models',
69+ 'RTSM.textile': 'RTSM',
70+ 'OPENJDK.textile': 'OpenJDK'}
71
72 TAB_PRIORITY = ['Release Notes',
73 'Binary Image Installation',
74 'Building From Source',
75 'Firmware',
76 'Fast Models',
77- 'RTSM']
78+ 'RTSM',
79+ 'OpenJDK']
80
81=== modified file 'django/settings_staging_releases.py'
82--- django/settings_staging_releases.py 2013-09-26 11:11:12 +0000
83+++ django/settings_staging_releases.py 2013-10-31 22:00:59 +0000
84@@ -27,7 +27,8 @@
85 'HACKING.textile',
86 'FIRMWARE.textile',
87 'FASTMODELS.textile',
88- 'RTSM.textile')
89+ 'RTSM.textile',
90+ 'OPENJDK.textile')
91
92 FILES_MAP = {'HOWTO_releasenotes.txt': 'Release Notes',
93 'HOWTO_install.txt': 'Binary Image Installation',
94@@ -39,5 +40,6 @@
95 'HACKING.textile': 'Building From Source',
96 'FIRMWARE.textile': 'Firmware',
97 'FASTMODELS.textile': 'Fast Models',
98- 'RTSM.textile': 'RTSM'}
99+ 'RTSM.textile': 'RTSM',
100+ 'OPENJDK.textile': 'OpenJDK'}
101

Subscribers

People subscribed via source and target branches