Merge lp://staging/~facundo/canonical-identity-provider/better-crypto-option into lp://staging/canonical-identity-provider/release

Proposed by Facundo Batista
Status: Merged
Approved by: Facundo Batista
Approved revision: no longer in the source branch.
Merged at revision: 1412
Proposed branch: lp://staging/~facundo/canonical-identity-provider/better-crypto-option
Merge into: lp://staging/canonical-identity-provider/release
Diff against target: 56 lines (+9/-13)
2 files modified
django_project/settings_base.py (+1/-12)
django_project/settings_devel.py (+8/-1)
To merge this branch: bzr merge lp://staging/~facundo/canonical-identity-provider/better-crypto-option
Reviewer Review Type Date Requested Status
Matias Bordese (community) Approve
Ricardo Kirkner (community) Approve
Review via email: mp+289091@code.staging.launchpad.net

Commit message

Load the RSA key in devel; for staging and production it will just be there (handled by the charm).

To post a comment you must log in.
Revision history for this message
Ricardo Kirkner (ricardokirkner) wrote :

LGTM

review: Approve
Revision history for this message
Matias Bordese (matiasb) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.