From cab441ea5727db1954cfbf67de51200876e0df7a Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Wed, 22 Apr 2015 11:46:38 -0700 Subject: [PATCH 1/2] Update PE dependency in 1.4.x PE < 3.7.0 binds to puppetlabs-concat 1.0.x, which is incompatible with the vhost rewrite that was added in puppetlabs-apache 1.2.0. --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index feb7daa19..1466e42e1 100644 --- a/metadata.json +++ b/metadata.json @@ -58,7 +58,7 @@ "requirements": [ { "name": "pe", - "version_requirement": "3.x" + "version_requirement": ">= 3.7.0 < 4.0.0" }, { "name": "puppet", From 06536478de0ab3b329af05cc7ae11a2cd145b7fb Mon Sep 17 00:00:00 2001 From: Morgan Haskel Date: Wed, 22 Apr 2015 13:00:43 -0700 Subject: [PATCH 2/2] 1.4.1 prep --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6dd08ab4..44ca14c39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +##2015-04-28 - Supported Release 1.4.1 + +This release corrects a metadata issue that has been present since release 1.2.0. The refactoring of `apache::vhost` to use `puppetlabs-concat` requires a version of concat newer than the version required in PE. If you are using PE 3.3.0 or earlier you will need to use version 1.1.1 or earlier of the `puppetlabs-apache` module. + ##2015-03-17 - Supported Release 1.4.0 ###Summary diff --git a/metadata.json b/metadata.json index 1466e42e1..e860ca407 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "puppetlabs-apache", - "version": "1.4.0", + "version": "1.4.1", "author": "puppetlabs", "summary": "Installs, configures, and manages Apache virtual hosts, web services, and modules.", "license": "Apache-2.0",