Merge lp://staging/~nick-moffitt/charms/trusty/squid-reverseproxy/bikeshedding into lp://staging/charms/trusty/squid-reverseproxy
Proposed by
Nick Moffitt
Status: | Merged |
---|---|
Merged at revision: | 52 |
Proposed branch: | lp://staging/~nick-moffitt/charms/trusty/squid-reverseproxy/bikeshedding |
Merge into: | lp://staging/charms/trusty/squid-reverseproxy |
Prerequisite: | lp://staging/~jacekn/charms/trusty/squid-reverseproxy/squid-reverseproxy-nrpe-fix |
Diff against target: |
261 lines (+56/-84) 2 files modified
hooks/hooks.py (+22/-50) templates/main_config.template (+34/-34) |
To merge this branch: | bzr merge lp://staging/~nick-moffitt/charms/trusty/squid-reverseproxy/bikeshedding |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Adam Israel (community) | Approve | ||
Review Queue (community) | automated testing | Needs Fixing | |
charmers | Pending | ||
Review via email: mp+247038@code.staging.launchpad.net |
Description of the change
This is almost entirely cosmetic clean-ups I performed while trying to work out the flow of data in this charm. It shouldn't do too much, but I think it will help maintenance if this codebase is to be preserved.
I started from jacekn's nrpe fix branch, so that's listed as a prereq.
To post a comment you must log in.
This items has failed automated testing! Results available here http:// reports. vapour. ws/charm- tests/charm- bundle- test-10961- results