Merge pull request #311 from bmjen/1.2.2-prep

Morgan Haskel · Morgan Haskel · commit 4ea84be7d702 · 2015-05-11T16:39:03.000-07:00
1.2.2 release prep
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+##2015-05-12 - Supported Release 1.2.2
+###Summary
+
+This release includes a bugfix.
+
+####Bugfixes
+- Fixes a bug introduced by MODULES-1700, in handling default retrieval of fragment backup parameter.
+
 ##2015-04-14 - Supported Release 1.2.1
 ###Summary
 
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-concat",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "Puppet Labs",
   "summary": "Construct files from multiple fragments.",
   "license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppetlabs-concat",`
`3`		`- "version": "1.2.1",`
	`3`	`+ "version": "1.2.2",`
`4`	`4`	`"author": "Puppet Labs",`
`5`	`5`	`"summary": "Construct files from multiple fragments.",`
`6`	`6`	`"license": "Apache-2.0",`