Prepare a 4.2.1 release.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc581ee5b955a96371a9e5916b6e4a81c1181662..5a3597e340445989ef7c448b5fbc4ce149755032 100644 (file)
--- 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 a6853489d76a667142ba7f39b81671b632a81beb..c5da72daccd87b9fe2f9b709b834da3121696c59 100644 (file)
--- 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 46ea7ac1fc589fe034afd170dc031c64768477e5..9d3847bf1edfdcc56ec6c4985ba6b3d0f96b4eb5 100644 (file)
--- 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 (file)
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
deleted file mode 120000 (symlink)
index 2719644a6e6fe5f78ae11363b14cc656a542aeca..0000000000000000000000000000000000000000
--- a/spec/acceptance/nodesets/default.yml
+++ /dev/null
@@ -1 +0,0 @@
-centos-64-x64.yml
\ No newline at end of file

diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..4e2cb809e853b019094d240442557966e682186a
--- /dev/null
+++ b/spec/acceptance/nodesets/default.yml
@@ -0,0 +1,10 @@
+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