Merge lp:~ibm-demo/charms/trusty/mediawiki/trunk into lp:charms/trusty/mediawiki

Proposed by Matt Bruzek on 2014-10-30
Status: Merged
Merged at revision: 82
Proposed branch: lp:~ibm-demo/charms/trusty/mediawiki/trunk
Merge into: lp:charms/trusty/mediawiki
Diff against target: 37 lines (+3/-2)
3 files modified
hooks/install (+1/-0)
metadata.yaml (+1/-1)
tests/100-deploy (+1/-1)
To merge this branch: bzr merge lp:~ibm-demo/charms/trusty/mediawiki/trunk
Reviewer Review Type Date Requested Status
Charles Butler (community) Approve on 2014-11-11
José Antonio Rey (community) 2014-10-30 Approve on 2014-11-11
Review Queue (community) automated testing Needs Fixing on 2014-10-31
Review via email: mp+240072@code.launchpad.net

Description of the change

I have proposed the changes that are necessary for mediawiki to run on power.

To post a comment you must log in.
Review Queue (review-queue) wrote :

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-1431-results

review: Needs Fixing (automated testing)
José Antonio Rey (jose) wrote :

Hey Matt,

I have ran the tests and checked the changes, everything looks good to me and tests pass.

+1 on my side!

Please wait on authorization from another charmer so I can push this fix to the store. Thanks for the fix!

review: Approve
Charles Butler (lazypower) wrote :

+1 LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install'
2--- hooks/install 2014-09-11 00:33:14 +0000
3+++ hooks/install 2014-10-30 01:40:05 +0000
4@@ -4,6 +4,7 @@
5
6 DISTRIB_CODENAME=$(lsb_release -cs)
7
8+apt-get update -qq
9 apt-get --no-install-recommends -y -q install mediawiki php5-cli postfix python-mysqldb pwgen
10
11 # a bit hacky -- makes sure its there even if memcached is never related
12
13=== modified file 'metadata.yaml'
14--- metadata.yaml 2013-04-22 19:36:55 +0000
15+++ metadata.yaml 2014-10-30 01:40:05 +0000
16@@ -7,7 +7,7 @@
17 library-like document collections, and supports user uploads of
18 images/sounds, multilingual content, TOC autogeneration, ISBN links,
19 etc.
20-categories: ["applications"]
21+tags: ["applications"]
22 requires:
23 db:
24 interface: mysql
25
26=== modified file 'tests/100-deploy'
27--- tests/100-deploy 2014-06-20 22:15:04 +0000
28+++ tests/100-deploy 2014-10-30 01:40:05 +0000
29@@ -4,7 +4,7 @@
30
31 seconds = 900
32
33-d = amulet.Deployment()
34+d = amulet.Deployment(series='trusty')
35
36 #Setup the charms, and relationships
37 d.add('mysql')

Subscribers

People subscribed via source and target branches

to all changes: