Merge lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups into lp:linaro-license-protection/configs
Status: | Merged |
---|---|
Merged at revision: | 30 |
Proposed branch: | lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups |
Merge into: | lp:linaro-license-protection/configs |
Diff against target: |
80 lines (+19/-0) 11 files modified
README (+3/-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) |
To merge this branch: | bzr merge lp:~pfalcon/linaro-license-protection/configs.capture-openid-groups |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Georgy Redkozubov | Approve | ||
Данило Шеган (community) | Approve | ||
Philip Colmer | Pending | ||
Review via email: mp+153859@code.launchpad.net |
This proposal supersedes 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.
Paul, what's the status of our move to using exclusively BUILD-INFO.txt for OpenID protection? If that's done, we should instead look at removing the apache-based openid stuff (not in this branch: just file a bug about it when needed).
Otherwise, these changes are good and we should keep the configs reflect the reality, so +1 from me.