opuppet/puppetlabs-stdlib
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

Browse source 
* 2.1.x:
  Update CHANGELOG, Modulefile for 2.1.3

Conflicts:
	CHANGELOG
	Modulefile
This commit is contained in:
Jeff McCune 2012-03-29 15:19:21 -07:00
commit 10c793f8f0
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG
View file

@ -1,3 +1,7 @@
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

2
Modulefile
View file

@ -1,5 +1,5 @@
name 'puppetlabs-stdlib'
version '2.2.1'
version '2.2.2'
source 'git://github.com/puppetlabs/puppetlabs-stdlib'
author 'puppetlabs'
license 'Apache 2.0'