From db914f1988555629ddfc25a12d501152e1161449 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Tue, 21 Jul 2015 14:38:45 -0700
Subject: [PATCH] 1.2.4 prep

---
 CHANGELOG.md  | 12 +++++++++++-
 metadata.json | 12 ++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68baf333f..f24932cbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+##2015-07-21 - Supported Release 1.2.4
+###Summary
+
+This release includes some ruby path and lint fixes.
+
+####Bugfixes
+- Use correct ruby path with PE and AIO
+- Lint fixes
+- Use correct ruby path on FreeBSD
+- Test fixes
+
 ##2015-06-02 - Supported Release 2.0.1 [YANKED]
 ###Summary
 
@@ -14,7 +25,6 @@ This is a bugfix release.
 This release includes a README fix to document correct behavior of fragment target parameter.
 
 ####Bugfixes
-
 - README Fix to correctly document how a fragment $target param should work.
 
 ##2015-05-12 - Supported Release 2.0.0 [YANKED]
diff --git a/metadata.json b/metadata.json
index 6f6adab6a..3f1caed7d 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,12 +1,15 @@
 {
   "name": "puppetlabs-concat",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "author": "Puppet Labs",
   "summary": "Construct files from multiple fragments.",
   "license": "Apache-2.0",
   "source": "https://github.com/puppetlabs/puppetlabs-concat",
   "project_page": "https://github.com/puppetlabs/puppetlabs-concat",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
+  "dependencies": [
+    {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"}
+  ],
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -98,14 +101,11 @@
   "requirements": [
     {
       "name": "pe",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 2015.3.0"
     },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
-  ],
-  "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"}
   ]
 }