Merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/no-expect-fork into lp:ubuntu/natty/squid-deb-proxy

Proposed by Clint Byrum on 2011-01-11
Status: Merged
Merged at revision: 7
Proposed branch: lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/no-expect-fork
Merge into: lp:ubuntu/natty/squid-deb-proxy
Diff against target: 25 lines (+8/-2)
2 files modified
debian/changelog (+7/-0)
debian/squid-deb-proxy.upstart (+1/-2)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/natty/squid-deb-proxy/no-expect-fork
Reviewer Review Type Date Requested Status
Micah Gersten 2011-01-11 Approve on 2011-01-12
Review via email: mp+45933@code.launchpad.net

Description of the change

Same fix that was applied to the main squid package's upstart job.

To post a comment you must log in.
Micah Gersten (micahg) wrote :

Looks good, will upload shortly

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-11-19 00:49:51 +0000
3+++ debian/changelog 2011-01-11 23:24:11 +0000
4@@ -1,3 +1,10 @@
5+squid-deb-proxy (0.3.4) natty; urgency=low
6+
7+ * Removing expect fork and passing -N to squid to prevent upstart
8+ losing track of squid on reload (LP: #573853)
9+
10+ -- Clint Byrum <clint@ubuntu.com> Tue, 11 Jan 2011 15:07:37 -0800
11+
12 squid-deb-proxy (0.3.3) natty; urgency=low
13
14 * Adjusting upstart job so restarting squid-deb-proxy does not result
15
16=== modified file 'debian/squid-deb-proxy.upstart'
17--- debian/squid-deb-proxy.upstart 2010-11-19 00:49:51 +0000
18+++ debian/squid-deb-proxy.upstart 2011-01-11 23:24:11 +0000
19@@ -14,5 +14,4 @@
20 start on (local-filesystems and net-device-up IFACE!=lo)
21 stop on runlevel [!2345]
22
23-expect fork
24-exec squid -f /etc/squid-deb-proxy/squid-deb-proxy.conf
25+exec squid -N -f /etc/squid-deb-proxy/squid-deb-proxy.conf

Subscribers

People subscribed via source and target branches

to all changes: