Merge lp://qastaging/~stub/charms/trusty/postgresql/fix-max-connections into lp://qastaging/charms/trusty/postgresql

Proposed by Stuart Bishop
Status: Merged
Merged at revision: 142
Proposed branch: lp://qastaging/~stub/charms/trusty/postgresql/fix-max-connections
Merge into: lp://qastaging/charms/trusty/postgresql
Diff against target: 54 lines (+14/-5)
3 files modified
config.yaml (+0/-1)
hooks/service.py (+5/-3)
tests/test_integration.py (+9/-1)
To merge this branch: bzr merge lp://qastaging/~stub/charms/trusty/postgresql/fix-max-connections
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
Andrew McLeod (community) Approve
charmers Pending
Review via email: mp+282974@code.qastaging.launchpad.net

Description of the change

Some deprecated options where not overriding the defaults in extra_pg_conf. Fix this by collating the settings in the correct order (overrides second).

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

The config.yaml change is removing a duplicate entry in the extra_pg_conf default.

Revision history for this message
Andrew McLeod (admcleod) wrote :

bundletested this, all tests passed, looks good. The automated tests seem to be stuck... +1

review: Approve
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws:8080/job/charm-bundle-test-aws/2254/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2446/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws:8080/job/charm-bundle-test-lxc/2447/

review: Needs Fixing (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: