Ubuntu CI Engine

Merge lp:~cjohnston/uci-engine/apache-apt-get-update into lp:uci-engine

  1. apache-apt-get-update
  2. Merge into trunk
Proposed by Chris Johnston
Status: Merged
Approved by: Francis Ginther
Approved revision: 565
Merged at revision: 565
Proposed branch: lp:~cjohnston/uci-engine/apache-apt-get-update
Merge into: lp:uci-engine
Diff against target: 25 lines (+2/-2)
2 files modified
juju-deployer/lander.yaml.tmpl (+1/-1)
juju-deployer/webui.yaml.tmpl (+1/-1)
To merge this branch: bzr merge lp:~cjohnston/uci-engine/apache-apt-get-update
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+222860@code.launchpad.net

Commit message

Update apache charm revno to include apt-get update fix

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'juju-deployer/lander.yaml.tmpl'
2--- juju-deployer/lander.yaml.tmpl 2014-06-03 18:17:09 +0000
3+++ juju-deployer/lander.yaml.tmpl 2014-06-11 18:46:48 +0000
4@@ -3,7 +3,7 @@
5 services:
6 ci-airline-lander-apache:
7 charm: apache2
8- branch: lp:charms/precise/apache2@53
9+ branch: lp:charms/precise/apache2@54
10 options:
11 # ensure "autoindex" is enabled (its helpful for finding logs)
12 enable_modules: "autoindex"
13
14=== modified file 'juju-deployer/webui.yaml.tmpl'
15--- juju-deployer/webui.yaml.tmpl 2014-06-09 22:01:37 +0000
16+++ juju-deployer/webui.yaml.tmpl 2014-06-11 18:46:48 +0000
17@@ -14,7 +14,7 @@
18 tenant_name: $OS_TENANT_NAME
19 ci-airline-webui-apache:
20 charm: apache2
21- branch: lp:charms/precise/apache2@53
22+ branch: lp:charms/precise/apache2@54
23 options:
24 enable_modules: "rewrite proxy proxy_http ssl"
25 vhost_http_template: include-base64://configs/webui_http_vhost

Subscribers

People subscribed via source and target branches