Merge lp://staging/~stub/charms/precise/postgresql/integration into lp://staging/charms/postgresql
Proposed by
Stuart Bishop
Status: | Merged |
---|---|
Merged at revision: | 105 |
Proposed branch: | lp://staging/~stub/charms/precise/postgresql/integration |
Merge into: | lp://staging/charms/postgresql |
Diff against target: |
2291 lines (+1428/-149) 24 files modified
.bzrignore (+1/-0) Makefile (+11/-2) README.md (+39/-0) charm-helpers.yaml (+1/-2) config.yaml (+71/-11) hooks/charmhelpers/core/fstab.py (+3/-1) hooks/charmhelpers/core/hookenv.py (+35/-20) hooks/charmhelpers/core/host.py (+44/-9) hooks/charmhelpers/core/services/__init__.py (+2/-0) hooks/charmhelpers/core/services/base.py (+313/-0) hooks/charmhelpers/core/services/helpers.py (+125/-0) hooks/charmhelpers/core/templating.py (+51/-0) hooks/charmhelpers/fetch/__init__.py (+51/-12) hooks/hooks.py (+273/-58) lib/test-client-charm/config.yaml (+13/-0) lib/test-client-charm/hooks/hooks.py (+165/-0) lib/test-client-charm/hooks/start (+3/-0) lib/test-client-charm/hooks/stop (+3/-0) lib/test-client-charm/metadata.yaml (+13/-0) templates/postgres.cron.tmpl (+14/-12) templates/postgresql.conf.tmpl (+3/-0) templates/swiftwal.conf.tmpl (+5/-5) test.py (+162/-12) testing/jujufixture.py (+27/-5) |
To merge this branch: | bzr merge lp://staging/~stub/charms/precise/postgresql/integration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Charles Butler (community) | deploy + code | Approve | |
Review Queue (community) | automated testing | Needs Fixing | |
Cory Johns (community) | Needs Fixing | ||
Adam Israel (community) | Needs Fixing | ||
Review via email:
|
Commit message
Various pending bug fixes and feature work.
Description of the change
Integration branch containing all of stub's PostgreSQL charm merge proposals currently in the review queue.
Separate, smaller merge proposals also exist, with each branch in the sequence dependent on the previous. This branch is here in case anyone wants to review everything at once.
To post a comment you must log in.
The results (PASS) are in and available here: http:// reports. vapour. ws/charm- tests/charm- bundle- test-960- results