From: Jeff McCune <jeff@puppetlabs.com>
Date: Thu, 29 Mar 2012 22:19:21 +0000 (-0700)
Subject: Merge branch '2.1.x' into 2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=10c793f8f0bca08a42237bddd18100e649e80df1;p=puppet-stdlib.git

Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile
---

10c793f8f0bca08a42237bddd18100e649e80df1
diff --cc CHANGELOG
index 318cbe9,8017362..4fe3e28
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,6 -1,7 +1,10 @@@
+ 2012-03-29 Puppet Labs <support@puppetlabs.com> - 2.1.3
+ * (#11607) Add Rakefile to enable spec testing
+ * (#12377) Avoid infinite loop when retrying require json
+ 
 +2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
 +* Documentation only release for the Forge
 +
  2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
  * Documentation only release for PE 2.0.x
  
diff --cc Modulefile
index 3efa8b9,2ba8cdc..0be5723
--- a/Modulefile
+++ b/Modulefile
@@@ -1,5 -1,5 +1,5 @@@
  name    'puppetlabs-stdlib'
- version '2.2.1'
 -version '2.1.3'
++version '2.2.2'
  source 'git://github.com/puppetlabs/puppetlabs-stdlib'
  author 'puppetlabs'
  license 'Apache 2.0'