Merge lp:~racb/ubuntu/precise/squid-deb-proxy/cloud-archive into lp:ubuntu/precise-proposed/squid-deb-proxy

Proposed by Robie Basak on 2013-01-07
Status: Merged
Merge reported by: James Page
Merged at revision: not available
Proposed branch: lp:~racb/ubuntu/precise/squid-deb-proxy/cloud-archive
Merge into: lp:ubuntu/precise-proposed/squid-deb-proxy
Diff against target: 26 lines (+7/-1)
2 files modified
debian/changelog (+6/-0)
mirror-dstdomain.acl (+1/-1)
To merge this branch: bzr merge lp:~racb/ubuntu/precise/squid-deb-proxy/cloud-archive
Reviewer Review Type Date Requested Status
James Page 2013-01-07 Approve on 2013-02-05
Review via email: mp+142088@code.launchpad.net
To post a comment you must log in.
Michael Vogt (mvo) wrote :

This is merged into squid-deb-proxy trunk now. I'm not sure if that should go into precise-updates though as there is a risk that this triggers a conffile prompt during the upgrade if the user has dropped files into it (and not used the .d directory).

James Page (james-page) wrote :

I've uploaded to precise-proposed; I think the conffile update is OK but I'll defer the final decision to the SRU team.

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 2012-04-19 14:46:24 +0000
3+++ debian/changelog 2013-01-07 10:51:26 +0000
4@@ -1,3 +1,9 @@
5+squid-deb-proxy (0.6.3.1) precise-proposed; urgency=low
6+
7+ * Allow caching of Canonical's cloud archive (LP: #1087145).
8+
9+ -- Robie Basak <robie.basak@canonical.com> Mon, 07 Jan 2013 10:13:44 +0000
10+
11 squid-deb-proxy (0.6.3) precise-proposed; urgency=low
12
13 [ Simon D├ęziel ]
14
15=== modified file 'mirror-dstdomain.acl'
16--- mirror-dstdomain.acl 2012-04-19 14:46:24 +0000
17+++ mirror-dstdomain.acl 2013-01-07 10:51:26 +0000
18@@ -10,7 +10,7 @@
19 mirrors.ubuntu.com
20
21 #official third party repositories
22-archive.canonical.com
23+.archive.canonical.com
24 extras.ubuntu.com
25
26 # default changelogs location, this includes changelogs and the meta-release

Subscribers

People subscribed via source and target branches

to all changes: