From: Jeff McCune <jeff@puppetlabs.com>
Date: Fri, 30 Dec 2011 20:19:15 +0000 (-0800)
Subject: Merge branch '2.1.x' into 2.2.x
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=ed0de46a2a0661a2457e5fed43a5c76f77414704;p=puppet-stdlib.git

Merge branch '2.1.x' into 2.2.x

* 2.1.x:
  Update Modulefile CHANGELOG for v2.1.2 release

Conflicts:
	CHANGELOG
	Modulefile
---

ed0de46a2a0661a2457e5fed43a5c76f77414704
diff --cc CHANGELOG
index dff036b,53d584b..96ff08c
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,9 -1,6 +1,12 @@@
+ 2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.1.2
+ * Documentation only release for PE 2.0.x
+ 
 +2011-11-08 Puppet Labs <support@puppetlabs.com> - 2.2.0
 +* #10285 - Refactor json to use pson instead.
 +* Maint  - Add watchr autotest script
 +* Maint  - Make rspec tests work with Puppet 2.6.4
 +* #9859  - Add root_home fact and tests
 +
  2011-08-18 Puppet Labs <support@puppetlabs.com> - 2.1.1
  * Change facts.d paths to match Facter 2.0 paths.
  * /etc/facter/facts.d