From 5267d3587c50e574cb96feda857f7f5b74e4e1ae Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Mon, 1 Jun 2015 15:30:04 -0700 Subject: [PATCH 1/2] 1.2.3 Release prep --- CHANGELOG.md | 9 +++++++++ metadata.json | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59204bb83..8ef82026d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,15 @@ This is a major release. Includes re-implementation of concat to use native Type ####Bugfixes - Fixes a bug in alpha ordering of fragments. +======= +##2015-06-02 - Supported Release 1.2.3 +###Summary + +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 1.2.2 ###Summary diff --git a/metadata.json b/metadata.json index 92fb8a182..a4a9e301b 100644 --- a/metadata.json +++ b/metadata.json @@ -7,9 +7,6 @@ "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":">= 4.5.0 < 5.0.0"} - ], "operatingsystem_support": [ { "operatingsystem": "RedHat", @@ -106,5 +103,8 @@ "name": "puppet", "version_requirement": "3.x" } + ], + "dependencies": [ + {"name":"puppetlabs/stdlib","version_requirement":">= 3.2.0 < 5.0.0"} ] } From d6ee5a8606d9a5161c6f4d1e9bd9dd833701d9c1 Mon Sep 17 00:00:00 2001 From: Bryan Jen Date: Mon, 1 Jun 2015 15:41:42 -0700 Subject: [PATCH 2/2] Release 2.0.1 prep --- CHANGELOG.md | 11 +++++++++++ metadata.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ef82026d..87a0443c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +======= +##2015-06-02 - Supported Release 2.0.1 +###Summary + +This is a bugfix release. + +####Bugfixes +- Fixes dependency graphing with concurrent modification of the same file. +- Fixes handling fragment target. +- Fixes the defaulted force behavior to handle empty concats correctly. + ======= ##2015-05-12 - Supported Release 2.0.0 ###Summary diff --git a/metadata.json b/metadata.json index a4a9e301b..31d9144d7 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-concat", - "version": "2.0.0", + "version": "2.0.1", "author": "Puppet Labs", "summary": "Construct files from multiple fragments.", "license": "Apache-2.0",