Merge lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups into lp:~linaro-automation/linaro-license-protection/trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups |
Merge into: | lp:~linaro-automation/linaro-license-protection/trunk |
Diff against target: |
991 lines (+872/-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 (+154/-0) django/settings_releases.py (+54/-0) django/settings_snapshots.py (+54/-0) django/settings_staging_releases.py (+39/-0) django/settings_staging_snapshots.py (+20/-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:~pfalcon/linaro-license-protection/configs.capture-openid-groups |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Philip Colmer | Pending | ||
Данило Шеган | Pending | ||
Linaro Automation & Validation | Pending | ||
Review via email: mp+153857@code.launchpad.net |
This proposal has been superseded by a proposal from 2013-03-18.
Description of the change
BP Ref: https:/
Reviewing setup Philip did on ec2-54-
$ diff -ur security security2
diff -ur security/
--- security/
+++ security2/
@@ -1 +1 @@
-Ubuntu=https:/
+Ubuntu=https:/
diff -ur security/
--- security/
+++ security2/
@@ -1,4 +1,4 @@
-linaro-
+naro-landing-
linaro-
linaro-
linaro-
Only in security: linaro-
Only in security: mservices.
Note that last hunk looks like typo.
Unmerged revisions
- 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 - 24. By Stevan Radaković
-
Move textile constants to settings so we can change them for releases.*.
- 23. By Данило Шеган
-
Update the snapshots.
linaro. org to match the actual production config. - 22. By Данило Шеган
-
Use python2.6 for production.
- 21. By Данило Шеган
-
Sync the configs with mombin IPs.