Merge pull request #526 from mhaskel/test

merge 4.1.x into master
This commit is contained in:
Travis Fields 2014-11-04 15:32:17 -08:00
commit 77283979b4
3 changed files with 25 additions and 16 deletions

View file

@ -1,3 +1,16 @@
##2014-11-04 - Supported Release 4.1.0
###Summary
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.
####Features
- Future parser support
- Documentation updates
- Test updates
- Add a link from `/etc/sysconfig/pgsql/postgresql-${version}` to `/etc/sysconfig/pgsql/postgresql` to support init scripts from the postgresql.org repo
- Add support for changing the PGDATA directory
- Set default versions for Fedora 21 and FreeBSD
##2014-09-03 - Supported Release 4.0.0
###Summary

View file

@ -18,13 +18,18 @@ Puppet::Type.type(:postgresql_conf).provide(
:to_line => proc { |h|
# simple string and numeric values don't need to be enclosed in quotes
dontneedquote = h[:value].match(/^(\w+)$/)
if h[:value].is_a?(Fixnum)
val = h[:value].to_s
else
val = h[:value]
end
dontneedquote = val.match(/^(\w+)$/)
dontneedequal = h[:name].match(/^(include|include_if_exists)$/i)
str = h[:name].downcase # normalize case
str += dontneedequal ? ' ' : ' = '
str += "'" unless dontneedquote && !dontneedequal
str += h[:value]
str += val
str += "'" unless dontneedquote && !dontneedequal
str += " # #{h[:comment]}" unless (h[:comment].nil? or h[:comment] == :absent)
str

View file

@ -1,12 +1,12 @@
{
"name": "puppetlabs-postgresql",
"version": "4.0.0",
"version": "4.1.0",
"author": "Inkling/Puppet Labs",
"summary": "PostgreSQL defined resource types",
"license": "ASL 2.0",
"source": "git://github.com/puppetlabs/puppet-postgresql.git",
"project_page": "https://github.com/puppetlabs/puppet-postgresql",
"issues_url": "https://github.com/puppetlabs/puppet-postgresql/issues",
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
@ -67,17 +67,8 @@
}
],
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": "4.x"
},
{
"name": "puppetlabs/apt",
"version_requirement": ">=1.1.0 <2.0.0"
},
{
"name": "puppetlabs/concat",
"version_requirement": ">= 1.1.0 <2.0.0"
}
{"name":"puppetlabs/stdlib","version_requirement":"4.x"},
{"name":"puppetlabs/apt","version_requirement":">=1.1.0 <2.0.0"},
{"name":"puppetlabs/concat","version_requirement":">= 1.1.0 <2.0.0"}
]
}