Merge lp://qastaging/~mthaddon/charm-haproxy/lp-2030726 into lp://qastaging/charm-haproxy
Proposed by
Tom Haddon
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | 🤖 Canonical IS Review Bot | ||||
| Approved revision: | 161 | ||||
| Merged at revision: | 161 | ||||
| Proposed branch: | lp://qastaging/~mthaddon/charm-haproxy/lp-2030726 | ||||
| Merge into: | lp://qastaging/charm-haproxy | ||||
| Diff against target: |
12 lines (+1/-1) 1 file modified
hooks/hooks.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mthaddon/charm-haproxy/lp-2030726 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| 🤖 Canonical IS Review Bot | Approve | ||
| Canonical IS Reviewers | Pending | ||
|
Review via email:
|
|||
Commit message
Ensure content of self-signed cert is correctly encoded lp#2030726
Description of the change
Ensure content of self-signed cert is correctly encoded lp#2030726.
If we're not using a self-signed cert the `content` is generated with `base64.b64decode` which returns bytes rather than a string, so make sure content is generated consistently here.
I've tested this by deploying haproxy (with ssl_cert=
To post a comment you must log in.
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Revision history for this message
| 🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote | # |
review:
Approve
Revision history for this message
| 🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This merge proposal is being monitored by mergebot. Change the status to Approved to merge.