Merge lp://staging/~maxiberta/canonical-identity-provider/charm-add-openid-session-limit into lp://staging/~ubuntuone-pqm-team/canonical-identity-provider/charm
Proposed by
Maximiliano Bertacchini
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Daniel Manrique | ||||
| Approved revision: | 90 | ||||
| Merge reported by: | Otto Co-Pilot | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~maxiberta/canonical-identity-provider/charm-add-openid-session-limit | ||||
| Merge into: | lp://staging/~ubuntuone-pqm-team/canonical-identity-provider/charm | ||||
| Diff against target: |
28 lines (+7/-0) 2 files modified
config.yaml (+4/-0) templates/settings.py.j2 (+3/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~maxiberta/canonical-identity-provider/charm-add-openid-session-limit | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Manrique (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Add openid_token_limit option (if set, overrides the project's settings.
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1 hohoho