Merge lp://staging/~marcoceppi/charms/precise/postgresql/CIDR-fail into lp://staging/charms/postgresql
Proposed by
Marco Ceppi
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 30 | ||||
| Proposed branch: | lp://staging/~marcoceppi/charms/precise/postgresql/CIDR-fail | ||||
| Merge into: | lp://staging/charms/postgresql | ||||
| Diff against target: |
15 lines (+2/-2) 1 file modified
templates/pg_hba.conf.tmpl (+2/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~marcoceppi/charms/precise/postgresql/CIDR-fail | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Clint Byrum (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
See lp:1117542
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
Marco.. I think you can just merge stuff like this. :)