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

Merge branch '2.2.x' into 2.3.x

* 2.2.x:
  (#13494) Specify the behavior of zero padded strings
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile
---

fea0b06bc828f452900943db962f4f7645bb0802
diff --cc CHANGELOG
index ac7c65f,4fe3e28..f027d4e
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,10 -1,7 +1,14 @@@
+ 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
+ 
 +2012-03-13 Puppet Labs <support@puppetlabs.com> - 2.3.1
 +* (#13091) Fix LoadError bug with puppet apply and puppet_vardir fact
 +
 +2012-03-12 Puppet Labs <support@puppetlabs.com> - 2.3.0
 +* Add a large number of new Puppet functions
 +* Backwards compatibility preserved with 2.2.x
 +
  2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
  * Documentation only release for the Forge
  
diff --cc Modulefile
index 10623db,0be5723..a6874ce
--- a/Modulefile
+++ b/Modulefile
@@@ -1,5 -1,5 +1,5 @@@
  name    'puppetlabs-stdlib'
- version '2.3.1'
 -version '2.2.2'
++version '2.3.2'
  source 'git://github.com/puppetlabs/puppetlabs-stdlib'
  author 'puppetlabs'
  license 'Apache 2.0'