Merge lp://staging/~stevanr/linaro-license-protection/configs-add-firmware-tab into lp://staging/~linaro-automation/linaro-license-protection/trunk
Proposed by
Stevan Radaković
| Status: | Rejected |
|---|---|
| Rejected by: | Stevan Radaković |
| Proposed branch: | lp://staging/~stevanr/linaro-license-protection/configs-add-firmware-tab |
| Merge into: | lp://staging/~linaro-automation/linaro-license-protection/trunk |
| Diff against target: |
1017 lines (+898/-0) (has conflicts) 23 files modified
README (+216/-0) apache/releases.linaro.org (+39/-0) apache/security/all-private-hwpack-teams.txt (+5/-0) apache/security/allowed-ops.txt (+1/-0) apache/security/arm-private-hwpack-teams.txt (+1/-0) apache/security/freescale-private-hwpack-teams.txt (+1/-0) apache/security/linaro-android-teams.txt (+2/-0) apache/security/linaro-teams.txt (+1/-0) apache/security/mservices.linaro.org-teams.txt (+2/-0) apache/security/samsung-private-hwpack-teams.txt (+1/-0) apache/security/ste-private-hwpack-teams.txt (+1/-0) apache/security/ti-private-hwpack-teams.txt (+1/-0) apache/snapshots.linaro.org (+165/-0) apache/staging.releases.linaro.org (+39/-0) apache/staging.snapshots.linaro.org (+164/-0) django/settings_releases.py (+59/-0) django/settings_snapshots.py (+59/-0) django/settings_staging_releases.py (+43/-0) django/settings_staging_snapshots.py (+22/-0) wsgi/wsgi_releases.py (+19/-0) wsgi/wsgi_snapshots.py (+19/-0) wsgi/wsgi_staging_releases.py (+19/-0) wsgi/wsgi_staging_snapshots.py (+19/-0) Conflict adding file README. Moved existing file to README.moved. |
| To merge this branch: | bzr merge lp://staging/~stevanr/linaro-license-protection/configs-add-firmware-tab |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Fathi Boudra | Approve | ||
|
Review via email:
|
|||
Description of the change
Add fastmodels tab. Rename 'Firmware update' to 'firmware'.
To post a comment you must log in.
Unmerged revisions
- 34. By Stevan Radaković
-
Add fastmodels tab. Rename 'Firmware update to 'firmware'.
- 33. By Milo Casagrande
-
Added UPLOAD_PATH setting.
- 32. By Milo Casagrande
-
Fixed Python path to point to Python 2.7.
- 31. By Paul Sokolovsky
-
Capture latest apache config from actual staging.
snapshots. linaro. org host. - 30. By Paul Sokolovsky
-
Update README with steps for /etc/apache2/
security/ population. - 29. By Paul Sokolovsky
-
Capture /etc/apache2/
security dir from snapshots. linaro. org This nostly contains OpenID group lists. These files are referenced
from *snapshots.linaro. org Apache site config files. - 28. By Paul Sokolovsky
-
Update name of deployment script.
- 27. By Georgy Redkozubov
-
Removed fallback support
- 26. By Georgy Redkozubov
-
[merge] Update LINUX_FILES according to spec
- 25. By Georgy Redkozubov
-
Remove HOWTO_flashfirm
ware.txt from mandatory files
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
ship it!