From 6cef1f4be7cb4dcbcb3693a5a5b531adb4be2bb9 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Mon, 18 Jul 2016 13:39:50 +0100
Subject: [PATCH] Prep for 4.8.0

---
 CHANGELOG.md  | 23 ++++++++++++++++++++++-
 README.md     |  8 ++++++++
 metadata.json |  9 +++------
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 011bf90..e5e0299 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,24 @@
+## Supported Release 4.8.0
+### Summary
+This release primarily fixes an issue with `postgresql_conf` values of ipaddresses being considered floats and not getting quoted.
+
+#### Features
+- Add `default_connect_settings` parameter to `postgresql::server`
+- Running under strict variables is now supported
+- Add timestamps into logs by default
+
+#### Bugfixes
+- Obscure password in postgresql\_psql type
+- Fix ip address quoting in postgresql\_conf type
+- Fix handling of systemd service on Ubuntu
+- Mark log_min_duration_statement setting as requiring a service restart
+- Add fixes for Fedora 23, Fedora 24, FreeBSD, OpenBSD
+- Fix environment handling to avoid "Overriding environment setting" message
+- Work around PUP-6385, using empty arrays instead of undef when specifying resource relationships
+- README editorial pass
+- Reduce whitespace in templates
+- Update build/test infrastructure
+
 ## Supported Release 4.7.1
 ### Summary
 This release contains some bugfixes and documentation updates.
@@ -559,7 +580,7 @@ the stage for the large scale refactoring work of 3.0.0.
 ####Features
 
 
-####Bugfixes 
+####Bugfixes
 - Use boolean for refreshonly.
 - Fix postgresql::plperl documentation.
 - Add two missing parameters to config::beforeservice
diff --git a/README.md b/README.md
index 02b5bd7..2cdbd6a 100644
--- a/README.md
+++ b/README.md
@@ -445,6 +445,10 @@ Sets the default database locale for all databases created with this module. On
 
 Overrides the default PostgreSQL log directory. Default: initdb's default path.
 
+##### `log_line_prefix`
+
+Set a prefix for the server logs. Default: `'%t '`
+
 ##### `manage_package_repo`
 
 Sets up official PostgreSQL repositories on your host if set to true. Default: false.
@@ -650,6 +654,10 @@ Specifies the addresses the server accepts connections to. Valid values:
 
 Sets the default database locale for all databases created with this module. On certain operating systems this is used during the `template1` initialization as well, so it becomes a default outside of the module. Default: undef, which is effectively `C`. **On Debian, you must ensure that the 'locales-all' package is installed for full functionality of PostgreSQL.**
 
+##### `log_line_prefix`
+
+Set a prefix for the server logs. Default: `'%t '`
+
 ##### `manage_pg_hba_conf`
 
 Whether to manage the pg_hba.conf. If set to true, Puppet overwrites this file. If set to false, Puppet does not modify the file. Valid values: true, false. Default
diff --git a/metadata.json b/metadata.json
index f9e5ced..2a59dc9 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-postgresql",
-  "version": "4.7.1",
+  "version": "4.8.0",
   "author": "Inkling/Puppet Labs",
   "summary": "Offers support for basic management of PostgreSQL databases.",
   "license": "Apache-2.0",
@@ -59,15 +59,12 @@
       "operatingsystemrelease": [
         "10.04",
         "12.04",
-        "14.04"
+        "14.04",
+        "16.04"
       ]
     }
   ],
   "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.0.0 < 2015.4.0"
-    },
     {
       "name": "puppet",
       "version_requirement": ">= 3.0.0 < 5.0.0"