Juju Charms Collection
ubuntu-repository-cache package

Merge lp:~james-page/charms/trusty/ubuntu-repository-cache/landing into lp:charms/trusty/ubuntu-repository-cache

  1. Trusty Tahr (14.04)
  2. landing
  3. Merge into trunk
Proposed by James Page
Status: Merged
Merged at revision: 208
Proposed branch: lp:~james-page/charms/trusty/ubuntu-repository-cache/landing
Merge into: lp:charms/trusty/ubuntu-repository-cache
Diff against target: 25 lines (+2/-2)
2 files modified
templates/apache2/archive_ubuntu_com.conf (+1/-1)
tests/110-multi_unit.simple (+1/-1)
To merge this branch: bzr merge lp:~james-page/charms/trusty/ubuntu-repository-cache/landing
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
Charles Butler (community) Approve
Review via email: mp+279004@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/1616/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1598/

review: Needs Fixing (automated testing)
Revision history for this message
Charles Butler (lazypower) wrote :

+1 LGTM

From what i see when testing, the peer is getting the rsync cron job, but that appears unrelated to this update. I've filed a bug against the charm here:
https://bugs.launchpad.net/charms/+source/ubuntu-repository-cache/+bug/1526928

Moving right along, merged the proposed update.

review: Approve
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/1818/

review: Needs Fixing (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/apache2/archive_ubuntu_com.conf'
2--- templates/apache2/archive_ubuntu_com.conf 2015-09-15 11:31:46 +0000
3+++ templates/apache2/archive_ubuntu_com.conf 2015-11-30 17:19:41 +0000
4@@ -16,7 +16,7 @@
5 DocumentRoot {{ DocumentRoot }}/www
6 # Munge the Cache-Control/Expires response headers to try make
7 # transparent proxy servers DTRT.
8- <Files ~ "Release(\.gpg)?|InRelease|Packages\.(bz2|gz)|Sources\.(bz2|gz)?|Translation-.*?$">
9+ <Files ~ "Release(\.gpg)?|InRelease|Packages\.(xz|bz2|gz)|Sources\.(xz|bz2|gz)?|Translation-.*?$">
10 ExpiresActive On
11 ExpiresDefault "modification plus 1800 seconds"
12 Header append Cache-Control "proxy-revalidate"
13
14=== modified file 'tests/110-multi_unit.simple'
15--- tests/110-multi_unit.simple 2015-05-02 00:22:24 +0000
16+++ tests/110-multi_unit.simple 2015-11-30 17:19:41 +0000
17@@ -78,7 +78,7 @@
18 raise
19 log('Start complete')
20
21-leader = d.sentry.unit[SERVICE + '/0']
22+leader = d.sentry[SERVICE][0]
23
24 # test that unit isn't serving metadata
25 url = 'http://{}'.format(leader.info['public-address'])

Subscribers

People subscribed via source and target branches

to all changes: