Merge lp:~bac/charms/trusty/wordpress/correct-wp-content into lp:charms/trusty/wordpress
Proposed by
Brad Crittenden
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 88 | ||||
Proposed branch: | lp:~bac/charms/trusty/wordpress/correct-wp-content | ||||
Merge into: | lp:charms/trusty/wordpress | ||||
Diff against target: |
187 lines (+143/-2) (has conflicts) 6 files modified
config.yaml (+2/-2) tests/00-setup (+5/-0) tests/01-standard (+53/-0) tests/02-memcached (+65/-0) tests/helper.py (+17/-0) tests/tests.yaml (+1/-0) Conflict adding file tests. Moved existing file to tests.moved. |
||||
To merge this branch: | bzr merge lp:~bac/charms/trusty/wordpress/correct-wp-content | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cory Johns (community) | Approve | ||
Review via email: mp+319138@code.launchpad.net |
Description of the change
Fix the example in config.yaml for wp-content as the old one does not exist.
To post a comment you must log in.
This has been merged and released as cs:trusty/ wordpress- 5