Merge lp:~blr/charms/precise/squid-forwardproxy/trunk into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk
Proposed by
Kit Randel
Status: | Merged |
---|---|
Merged at revision: | 31 |
Proposed branch: | lp:~blr/charms/precise/squid-forwardproxy/trunk |
Merge into: | lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk |
Diff against target: |
79 lines (+22/-4) 2 files modified
config.yaml (+7/-0) hooks/hooks.py (+15/-4) |
To merge this branch: | bzr merge lp:~blr/charms/precise/squid-forwardproxy/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+271224@code.launchpad.net |
Commit message
* Add 'run' config option, allowing explicit starting or stopping of the squid service.
* Rename deprecated (invalid?) juju-log log-level 'FATAL' to 'CRITICAL'.
To post a comment you must log in.