summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md4
-rw-r--r--Modulefile2
-rw-r--r--metadata.json2
-rw-r--r--spec/acceptance/nodesets/centos-65-x64.yml10
-rw-r--r--[l---------]spec/acceptance/nodesets/default.yml11
5 files changed, 16 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc581ee..5a3597e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2014-05-08 - Release - 4.2.1
+### Summary
+This release moves a stray symlink that can cause problems.
+
## 2014-05-08 - Release - 4.2.0
### Summary
This release adds many new functions and fixes, and continues to be backwards compatible with stdlib 3.x
diff --git a/Modulefile b/Modulefile
index a685348..c5da72d 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
name 'puppetlabs-stdlib'
-version '4.2.0'
+version '4.2.1'
source 'git://github.com/puppetlabs/puppetlabs-stdlib.git'
author 'puppetlabs'
license 'Apache 2.0'
diff --git a/metadata.json b/metadata.json
index 46ea7ac..9d3847b 100644
--- a/metadata.json
+++ b/metadata.json
@@ -92,7 +92,7 @@
}
],
"name": "puppetlabs-stdlib",
- "version": "4.2.0",
+ "version": "4.2.1",
"source": "git://github.com/puppetlabs/puppetlabs-stdlib",
"author": "puppetlabs",
"license": "Apache 2.0",
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml
deleted file mode 100644
index 4e2cb80..0000000
--- a/spec/acceptance/nodesets/centos-65-x64.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-HOSTS:
- centos-65-x64:
- roles:
- - master
- platform: el-6-x86_64
- box : centos-65-x64-vbox436-nocm
- box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
- hypervisor : vagrant
-CONFIG:
- type: foss
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index 2719644..4e2cb80 120000..100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1 +1,10 @@
-centos-64-x64.yml \ No newline at end of file
+HOSTS:
+ centos-65-x64:
+ roles:
+ - master
+ platform: el-6-x86_64
+ box : centos-65-x64-vbox436-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss