Merge lp://qastaging/~nick-moffitt/charm-haproxy/fixes-to-linting-fixes into lp://qastaging/charm-haproxy
Proposed by
Nick Moffitt
| Status: | Merged |
|---|---|
| Approved by: | Jamon Camisso |
| Approved revision: | 126 |
| Merged at revision: | 127 |
| Proposed branch: | lp://qastaging/~nick-moffitt/charm-haproxy/fixes-to-linting-fixes |
| Merge into: | lp://qastaging/charm-haproxy |
| Prerequisite: | lp://qastaging/~barryprice/charm-haproxy/linting-fixes |
| Diff against target: |
75 lines (+7/-19) 2 files modified
hooks/hooks.py (+3/-3) hooks/tests/test_helpers.py (+4/-16) |
| To merge this branch: | bzr merge lp://qastaging/~nick-moffitt/charm-haproxy/fixes-to-linting-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| haproxy-team | Pending | ||
|
Review via email:
|
|||
Commit message
Fixed concerns from https:/
Description of the change
I had some comments on barry's merge, but here's my fixes.
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 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.