Merge lp:~arges/squid-deb-proxy/lp1195430-saucy into lp:squid-deb-proxy

Proposed by Chris J Arges
Status: Merged
Merged at revision: 99
Proposed branch: lp:~arges/squid-deb-proxy/lp1195430-saucy
Merge into: lp:squid-deb-proxy
Diff against target: 25 lines (+7/-0)
2 files modified
allowed-networks-src.acl (+1/-0)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~arges/squid-deb-proxy/lp1195430-saucy
Reviewer Review Type Date Requested Status
squid-deb-proxy-developers Pending
Review via email: mp+171893@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Michael Vogt (mvo) wrote :

On Thu, Jun 27, 2013 at 07:22:25PM -0000, Chris J Arges wrote:
> Chris J Arges has proposed merging lp:~arges/squid-deb-proxy/lp1195430-saucy into lp:squid-deb-proxy.
>
> Requested reviews:
> squid-deb-proxy-developers (squid-deb-proxy-developers)
> Related bugs:
> Bug #1195430 in squid-deb-proxy (Ubuntu): "local squid-deb-proxy blocks sbuild"
> https://bugs.launchpad.net/ubuntu/+source/squid-deb-proxy/+bug/1195430
>
> For more details, see:
> https://code.launchpad.net/~arges/squid-deb-proxy/lp1195430-saucy/+merge/171893
> --
> https://code.launchpad.net/~arges/squid-deb-proxy/lp1195430-saucy/+merge/171893
> You are subscribed to branch lp:squid-deb-proxy.

Thanks for your branch! merged and uploaded :) (via debian)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'allowed-networks-src.acl'
2--- allowed-networks-src.acl 2012-07-05 13:40:13 +0000
3+++ allowed-networks-src.acl 2013-06-27 19:21:27 +0000
4@@ -10,6 +10,7 @@
5
6 # IPv6 private addresses
7 fe80::/64
8+::1/128
9
10 # additional non-private networks can be added to the directory:
11 # /etc/squid-deb-proxy/allowed-networks-src.acl.d
12
13=== modified file 'debian/changelog'
14--- debian/changelog 2013-06-18 11:55:30 +0000
15+++ debian/changelog 2013-06-27 19:21:27 +0000
16@@ -1,3 +1,9 @@
17+squid-deb-proxy (0.7.1ubuntu1) saucy; urgency=low
18+
19+ * Add additional ipv6 localhost address. (LP: #1195430)
20+
21+ -- Chris J Arges <chris.j.arges@ubuntu.com> Thu, 27 Jun 2013 14:18:09 -0500
22+
23 squid-deb-proxy (0.7.1) unstable; urgency=low
24
25 * fix package description, thanks to martin f krafft

Subscribers

People subscribed via source and target branches

to all changes: