Merge lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix into lp:charms/trusty/wordpress
Proposed by
james beedy
Status: | Merged |
---|---|
Merged at revision: | 87 |
Proposed branch: | lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix |
Merge into: | lp:charms/trusty/wordpress |
Diff against target: |
44 lines (+17/-1) 2 files modified
files/charm/apache/etc_apache2_conf-d_php5-fpm.conf (+4/-0) hooks/config-changed (+13/-1) |
To merge this branch: | bzr merge lp:~jamesbeedy/charms/trusty/wordpress/apache2_trusty_fix |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Review Queue (community) | automated testing | Approve | |
Pen Gale (community) | Approve | ||
Marco Ceppi | Pending | ||
charmers | Pending | ||
Review via email: mp+297720@code.launchpad.net |
Description of the change
Modified to include support for > precise.
Fixes Bug #1593498
To post a comment you must log in.
The code makes sense, and the charm deploys successfully and tests pass. +1
(It looks like there might be an issue with the tests when run via bundletester -- they pass, but leave the wordpress machine in a "hook failed: cache-relation- changed" for memcached:cache" state. The precise tests in trunk do the same thing, however, so I don't believe that it is related to this code, or should block this PR from being merged.)