From 14c9155745fe4b472e530da6965c0866b6f2640d Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Fri, 9 May 2014 16:57:32 +0200
Subject: [PATCH] Prepare a 4.2.1 release.

---
 CHANGELOG.md                               |  4 ++++
 Modulefile                                 |  2 +-
 metadata.json                              |  2 +-
 spec/acceptance/nodesets/centos-65-x64.yml | 10 ----------
 spec/acceptance/nodesets/default.yml       | 11 ++++++++++-
 5 files changed, 16 insertions(+), 13 deletions(-)
 delete mode 100644 spec/acceptance/nodesets/centos-65-x64.yml
 mode change 120000 => 100644 spec/acceptance/nodesets/default.yml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc581ee5b..5a3597e34 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 a6853489d..c5da72dac 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 46ea7ac1f..9d3847bf1 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 4e2cb809e..000000000
--- 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
index 2719644a6..000000000
--- 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
index 000000000..4e2cb809e
--- /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