Skip to content

Commit 7728397

Browse files
committed
Merge pull request puppetlabs#526 from mhaskel/test
merge 4.1.x into master
2 parents 4f4cfb0 + 0b483a2 commit 7728397

File tree

3 files changed

+25
-16
lines changed

3 files changed

+25
-16
lines changed

CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
##2014-11-04 - Supported Release 4.1.0
2+
###Summary
3+
4+
This release adds the ability to change the PGDATA directory, and also includes documentation and test updates, future parser support, and a few other new features.
5+
6+
####Features
7+
- Future parser support
8+
- Documentation updates
9+
- Test updates
10+
- Add a link from `/etc/sysconfig/pgsql/postgresql-${version}` to `/etc/sysconfig/pgsql/postgresql` to support init scripts from the postgresql.org repo
11+
- Add support for changing the PGDATA directory
12+
- Set default versions for Fedora 21 and FreeBSD
13+
114
##2014-09-03 - Supported Release 4.0.0
215
###Summary
316

lib/puppet/provider/postgresql_conf/parsed.rb

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@
1818
:to_line => proc { |h|
1919

2020
# simple string and numeric values don't need to be enclosed in quotes
21-
dontneedquote = h[:value].match(/^(\w+)$/)
21+
if h[:value].is_a?(Fixnum)
22+
val = h[:value].to_s
23+
else
24+
val = h[:value]
25+
end
26+
dontneedquote = val.match(/^(\w+)$/)
2227
dontneedequal = h[:name].match(/^(include|include_if_exists)$/i)
2328

2429
str = h[:name].downcase # normalize case
2530
str += dontneedequal ? ' ' : ' = '
2631
str += "'" unless dontneedquote && !dontneedequal
27-
str += h[:value]
32+
str += val
2833
str += "'" unless dontneedquote && !dontneedequal
2934
str += " # #{h[:comment]}" unless (h[:comment].nil? or h[:comment] == :absent)
3035
str

metadata.json

+5-14
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "puppetlabs-postgresql",
3-
"version": "4.0.0",
3+
"version": "4.1.0",
44
"author": "Inkling/Puppet Labs",
55
"summary": "PostgreSQL defined resource types",
66
"license": "ASL 2.0",
77
"source": "git://github.com/puppetlabs/puppet-postgresql.git",
88
"project_page": "https://github.com/puppetlabs/puppet-postgresql",
9-
"issues_url": "https://github.com/puppetlabs/puppet-postgresql/issues",
9+
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
1010
"operatingsystem_support": [
1111
{
1212
"operatingsystem": "RedHat",
@@ -67,17 +67,8 @@
6767
}
6868
],
6969
"dependencies": [
70-
{
71-
"name": "puppetlabs/stdlib",
72-
"version_requirement": "4.x"
73-
},
74-
{
75-
"name": "puppetlabs/apt",
76-
"version_requirement": ">=1.1.0 <2.0.0"
77-
},
78-
{
79-
"name": "puppetlabs/concat",
80-
"version_requirement": ">= 1.1.0 <2.0.0"
81-
}
70+
{"name":"puppetlabs/stdlib","version_requirement":"4.x"},
71+
{"name":"puppetlabs/apt","version_requirement":">=1.1.0 <2.0.0"},
72+
{"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <2.0.0"}
8273
]
8374
}

0 commit comments

Comments
 (0)