Merge lp://qastaging/~gandelman-a/ubuntu/precise/squid3/lp891445 into lp://qastaging/ubuntu/precise/squid3
Proposed by
Adam Gandelman
| Status: | Merged |
|---|---|
| Merge reported by: | James Page |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~gandelman-a/ubuntu/precise/squid3/lp891445 |
| Merge into: | lp://qastaging/ubuntu/precise/squid3 |
| Diff against target: |
144 lines (+43/-56) 3 files modified
debian/changelog (+11/-0) debian/rules (+1/-1) debian/squid3.upstart (+31/-55) |
| To merge this branch: | bzr merge lp://qastaging/~gandelman-a/ubuntu/precise/squid3/lp891445 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
The upstart job now shipped with squid3 is an upstart-ified version of the sysv init script shipped with the squid(v2) package. This fixes a couple of bugs in in the pre-start that were a result of the conversion to upstart.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
