Merge pull request redhat-openstack#254 from apenney/421

Prepare a 4.2.1 release.
strider · May 9, 2014 · 08b00d9 · 08b00d9
2 parents 04fa5a0 + 14c9155
commit 08b00d9
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
diff --git a/spec/acceptance/nodesets/default.yml 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