Merge lp://staging/~dspiteri/charms/precise/etherpad-lite/pythonport into lp://staging/charms/etherpad-lite
Proposed by
Darren Spiteri
| Status: | Merged |
|---|---|
| Merged at revision: | 13 |
| Proposed branch: | lp://staging/~dspiteri/charms/precise/etherpad-lite/pythonport |
| Merge into: | lp://staging/charms/etherpad-lite |
| Diff against target: |
4707 lines (+4260/-203) 35 files modified
README.md (+13/-12) config.yaml (+30/-8) hooks/charmhelpers/contrib/charmhelpers/IMPORT (+4/-0) hooks/charmhelpers/contrib/charmhelpers/__init__.py (+183/-0) hooks/charmhelpers/contrib/charmsupport/IMPORT (+14/-0) hooks/charmhelpers/contrib/charmsupport/nrpe.py (+217/-0) hooks/charmhelpers/contrib/charmsupport/volumes.py (+156/-0) hooks/charmhelpers/contrib/hahelpers/IMPORT (+7/-0) hooks/charmhelpers/contrib/hahelpers/apache_utils.py (+196/-0) hooks/charmhelpers/contrib/hahelpers/ceph_utils.py (+256/-0) hooks/charmhelpers/contrib/hahelpers/cluster_utils.py (+130/-0) hooks/charmhelpers/contrib/hahelpers/haproxy_utils.py (+55/-0) hooks/charmhelpers/contrib/hahelpers/utils.py (+332/-0) hooks/charmhelpers/contrib/jujugui/IMPORT (+4/-0) hooks/charmhelpers/contrib/jujugui/utils.py (+602/-0) hooks/charmhelpers/contrib/openstack/IMPORT (+9/-0) hooks/charmhelpers/contrib/openstack/nova/essex (+43/-0) hooks/charmhelpers/contrib/openstack/nova/folsom (+81/-0) hooks/charmhelpers/contrib/openstack/nova/nova-common (+147/-0) hooks/charmhelpers/contrib/openstack/openstack-common (+781/-0) hooks/charmhelpers/contrib/openstack/openstack_utils.py (+228/-0) hooks/charmhelpers/core/hookenv.py (+267/-0) hooks/charmhelpers/core/host.py (+188/-0) hooks/charmhelpers/fetch/__init__.py (+46/-0) hooks/charmhelpers/payload/__init__.py (+1/-0) hooks/charmhelpers/payload/execd.py (+40/-0) hooks/ep-common (+0/-164) hooks/hooks.py (+177/-0) metadata.yaml (+3/-0) revision (+1/-1) templates/etherpad-lite.conf (+16/-0) templates/settings.json.dirty (+5/-5) templates/settings.json.mysql (+8/-8) templates/settings.json.postgres (+15/-0) templates/settings.json.sqlite (+5/-5) |
| To merge this branch: | bzr merge lp://staging/~dspiteri/charms/precise/etherpad-lite/pythonport |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mark Mims (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
lgtm.
Please consider adding back support for a config option to install ep from upstream i.e., git
Thanks!