Merge lp://staging/~brad-marshall/charms/precise/squid-reverseproxy/http-port-config into lp://staging/charms/squid-reverseproxy
Proposed by
Brad Marshall
| Status: | Merged |
|---|---|
| Merge reported by: | Marco Ceppi |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~brad-marshall/charms/precise/squid-reverseproxy/http-port-config |
| Merge into: | lp://staging/charms/squid-reverseproxy |
| Diff against target: |
24 lines (+5/-1) 2 files modified
config.yaml (+4/-0) templates/main_config.template (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~brad-marshall/charms/precise/squid-reverseproxy/http-port-config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Van Steenburgh (community) | Approve | ||
| Dave Cheney (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Made http_port options configurable, and default to port 80
To post a comment you must log in.
Revision history for this message
| Tim Van Steenburgh (tvansteenburgh) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM.