Merge pull request redhat-openstack#177 from puppetlabs/1.4.x

1.4.x
xbezdick · Jul 9, 2015 · 2a7dbc1 · 2a7dbc1
2 parents bf32ac8 + 7543b3c
commit 2a7dbc1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
 

diff --git 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",