Merge lp:~blr/charms/precise/squid-forwardproxy/rutabaga-auth-helper into lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk
Proposed by
Kit Randel
Status: | Merged |
---|---|
Merged at revision: | 34 |
Proposed branch: | lp:~blr/charms/precise/squid-forwardproxy/rutabaga-auth-helper |
Merge into: | lp:~canonical-launchpad-branches/charms/precise/squid-forwardproxy/trunk |
Diff against target: |
146 lines (+49/-20) 3 files modified
config.yaml (+6/-7) hooks/hooks.py (+39/-13) metadata.yaml (+4/-0) |
To merge this branch: | bzr merge lp:~blr/charms/precise/squid-forwardproxy/rutabaga-auth-helper |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+278920@code.launchpad.net |
Commit message
* Add wait_for_
* Remove 'run' config.
To post a comment you must log in.