Merge lp://staging/~stub/charms/trusty/postgresql/fix-max-connections into lp://staging/charms/trusty/postgresql
Proposed by
Stuart Bishop
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 142 | ||||
Proposed branch: | lp://staging/~stub/charms/trusty/postgresql/fix-max-connections | ||||
Merge into: | lp://staging/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://staging/~stub/charms/trusty/postgresql/fix-max-connections | ||||
Related bugs: |
|
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.staging.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.
The config.yaml change is removing a duplicate entry in the extra_pg_conf default.