From 101519d5e9a093357da89b62322ff61a869a7f39 Mon Sep 17 00:00:00 2001
From: Jonathan Tripathy <jt@puppetlabs.com>
Date: Tue, 7 Jul 2015 10:37:55 +0100
Subject: [PATCH 1/2] Release Prep 1.4.0

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 375e910f0..8f9663dcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+##2015-07-07 - Supported Releases 1.4.0
+###Summary
+
+This is primarily a release which includes acceptance tests updates, but also includes some minor bug fixes and improvements
+
+####Features
+- Solaris 12 Support
+- Acceptance testing improvements
+
+####Bugfixes
+- MODULES-1599 Match only on space and tab whitespace after k/v separator
+
 ##2015-06-09 - Supported Releases 1.3.0
 ###Summary
 

From b36984132dc45600f69d7d3166673e31dd1aa652 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@puppetlabs.com>
Date: Wed, 8 Jul 2015 11:54:54 -0700
Subject: [PATCH 2/2] Bump version for release

---
 metadata.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/metadata.json b/metadata.json
index 9dab0e6a7..b987e2186 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-inifile",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "author": "Puppet Labs",
   "summary": "Resource types for managing settings in INI files",
   "license": "Apache-2.0",