Merge lp:~hloeung/mojo/mojo-specs-locations-locations into lp:mojo/mojo-specs

Proposed by Haw Loeung on 2019-04-17
Status: Merged
Approved by: Haw Loeung on 2019-04-17
Approved revision: 136
Merged at revision: 136
Proposed branch: lp:~hloeung/mojo/mojo-specs-locations-locations
Merge into: lp:mojo/mojo-specs
Diff against target: 27 lines (+10/-6)
1 file modified
charm-testing/content-cache/deploy (+10/-6)
To merge this branch: bzr merge lp:~hloeung/mojo/mojo-specs-locations-locations
Reviewer Review Type Date Requested Status
Joel Sing +1 2019-04-17 Approve on 2019-04-17
Review via email: mp+366155@code.launchpad.net

Commit message

charm-testing/content-cache: Updated config for updated charm rework

To post a comment you must log in.

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Joel Sing (jsing) wrote :

LGTM

review: Approve (+1)

Change successfully merged at revision 136

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charm-testing/content-cache/deploy'
2--- charm-testing/content-cache/deploy 2019-03-18 00:52:14 +0000
3+++ charm-testing/content-cache/deploy 2019-04-17 06:30:29 +0000
4@@ -6,13 +6,17 @@
5 options:
6 sites: |
7 archive.ubuntu.com:
8- backends:
9- - 91.189.88.149:80
10- - 91.189.88.152:80
11+ locations:
12+ '/':
13+ backends:
14+ - 91.189.88.149:80
15+ - 91.189.88.152:80
16 www.ubuntu.com:
17- backends:
18- - 91.189.90.58:443
19- backend-tls: True
20+ locations:
21+ '/':
22+ backends:
23+ - 91.189.90.58:443
24+ backend-tls: True
25 nrpe:
26 charm: nrpe
27 options:

Subscribers

People subscribed via source and target branches

to all changes: