Merge lp:~yolanda.robla/charms/precise/postgresql/fix_tabs into lp:charms/postgresql

Proposed by Yolanda Robla
Status: Merged
Approved by: Stuart Bishop
Approved revision: 66
Merged at revision: 66
Proposed branch: lp:~yolanda.robla/charms/precise/postgresql/fix_tabs
Merge into: lp:charms/postgresql
Diff against target: 20 lines (+5/-5)
1 file modified
config.yaml (+5/-5)
To merge this branch: bzr merge lp:~yolanda.robla/charms/precise/postgresql/fix_tabs
Reviewer Review Type Date Requested Status
Stuart Bishop Pending
Review via email: mp+189057@code.launchpad.net

Description of the change

Fixing config.yaml, removing unused tabs

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

Seems like a good fix to me.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'config.yaml'
--- config.yaml 2013-09-23 09:39:17 +0000
+++ config.yaml 2013-10-03 12:16:31 +0000
@@ -4,11 +4,11 @@
4 type: string4 type: string
5 description: |5 description: |
6 A comma-separated list of IP Addresses (or single IP) admin tools like 6 A comma-separated list of IP Addresses (or single IP) admin tools like
7 pgAdmin3 will connect from, this is most useful for developers running 7 pgAdmin3 will connect from, this is most useful for developers running
8 juju in local mode who need to connect tools like pgAdmin to a postgres. 8 juju in local mode who need to connect tools like pgAdmin to a postgres.
9 The IP addresses added here will be included in the pg_hba.conf file 9 The IP addresses added here will be included in the pg_hba.conf file
10 allowing ip connections to all databases on the server from the given 10 allowing ip connections to all databases on the server from the given
11 using md5 password encryption.11 using md5 password encryption.
12 locale:12 locale:
13 default: "C"13 default: "C"
14 type: string14 type: string

Subscribers

People subscribed via source and target branches