linaro-license-protection

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

  1. 1246428
  2. Merge into trunk
Proposed by Georgy Redkozubov
Status: Merged
Approved by: Milo Casagrande
Approved revision: 223
Merged at revision: 222
Proposed branch: lp:~gesha/linaro-license-protection/1246428
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 72 lines (+16/-17)
3 files modified
settings.py (+16/-13)
templates/header.html (+0/-2)
templates_releases/header.html (+0/-2)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/1246428
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Review via email: mp+193522@code.launchpad.net

Description of the change

This branch adds OpenJDK tab on snapshots.l.o and releases.l.o and fixes names for underlying files.

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 'settings.py'
2--- settings.py 2013-09-26 09:08:37 +0000
3+++ settings.py 2013-11-01 00:22:18 +0000
4@@ -190,12 +190,13 @@
5 )
6
7 # Render TEXTILE files settings.
8-LINUX_FILES = ('README',
9- 'INSTALL',
10- 'HACKING',
11- 'FIRMWARE',
12- 'FASTMODELS',
13- 'RTSM')
14+LINUX_FILES = ('README.textile',
15+ 'INSTALL.textile',
16+ 'HACKING.textile',
17+ 'FIRMWARE.textile',
18+ 'FASTMODELS.textile',
19+ 'RTSM.textile',
20+ 'OPENJDK.textile')
21
22 ANDROID_FILES = ('HOWTO_releasenotes.txt',
23 'HOWTO_install.txt',
24@@ -208,19 +209,21 @@
25 'HOWTO_getsourceandbuild.txt': 'Building From Source',
26 'HOWTO_flashfirmware.txt': 'Firmware',
27 'HOWTO_rtsm.txt': 'RTSM',
28- 'README': 'Release Notes',
29- 'INSTALL': 'Binary Image Installation',
30- 'HACKING': 'Building From Source',
31- 'FIRMWARE': 'Firmware',
32- 'FASTMODELS': 'Fast Models',
33- 'RTSM': 'RTSM'}
34+ 'README.textile': 'Release Notes',
35+ 'INSTALL.textile': 'Binary Image Installation',
36+ 'HACKING.textile': 'Building From Source',
37+ 'FIRMWARE.textile': 'Firmware',
38+ 'FASTMODELS.textile': 'Fast Models',
39+ 'RTSM.textile': 'RTSM',
40+ 'OPENJDK.textile': 'OpenJDK'}
41
42 TAB_PRIORITY = ['Release Notes',
43 'Binary Image Installation',
44 'Building From Source',
45 'Firmware',
46 'Fast Models',
47- 'RTSM']
48+ 'RTSM',
49+ 'OpenJDK']
50
51 SUPPORTED_REMOTE_STATIC_FILES = {
52 "linarofamily.js": "http://www.linaro.org/remote/js/linarofamily.js",
53
54=== modified file 'templates/header.html'
55--- templates/header.html 2013-10-09 12:35:30 +0000
56+++ templates/header.html 2013-11-01 00:22:18 +0000
57@@ -1,5 +1,3 @@
58-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
59- "http://www.w3.org/TR/html4/loose.dtd">
60 <html>
61 <head>
62 {% if dl != None %}
63
64=== modified file 'templates_releases/header.html'
65--- templates_releases/header.html 2013-10-09 12:35:30 +0000
66+++ templates_releases/header.html 2013-11-01 00:22:18 +0000
67@@ -1,5 +1,3 @@
68-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
69- "http://www.w3.org/TR/html4/loose.dtd">
70 <html>
71 <head>
72 {% if dl != None %}

Subscribers

People subscribed via source and target branches