Merge lp://staging/~caio1982/capomastro/charm-swiftencryption into lp://staging/~ubuntuone-hackers/capomastro/charm
Proposed by
Caio Begotti
| Status: | Merged |
|---|---|
| Approved by: | Daniel Manrique |
| Approved revision: | 64 |
| Merged at revision: | 63 |
| Proposed branch: | lp://staging/~caio1982/capomastro/charm-swiftencryption |
| Merge into: | lp://staging/~ubuntuone-hackers/capomastro/charm |
| Prerequisite: | lp://staging/~roadmr/capomastro/swift-password-encryption |
| Diff against target: |
30 lines (+6/-3) 2 files modified
hooks/install (+4/-2) templates/capomastro_key_settings.tmpl (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~caio1982/capomastro/charm-swiftencryption |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel Manrique (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
So these changes update the charm code to use the new management command that creates an password encryption key. This has been tested on Wendigo to build an Android image and archive it in Swift.
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
Looks OK to me, thanks!