Merge pull request #177 from puppetlabs/1.4.x

Morgan Haskel · Morgan Haskel · commit 2a7dbc140dee · 2015-07-09T11:50:05.000-07:00
1.4.x
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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs-inifile",`
`3`		`- "version": "1.3.0",`
	`3`	`+ "version": "1.4.0",`
`4`	`4`	`"author": "Puppet Labs",`
`5`	`5`	`"summary": "Resource types for managing settings in INI files",`
`6`	`6`	`"license": "Apache-2.0",`