Merge branch '2.1.x' into 2.2.x

Jeff McCune · Jeff McCune · commit ed0de46a2a06 · 2011-12-30T12:19:15.000-08:00
* 2.1.x:
  Update Modulefile CHANGELOG for v2.1.2 release

Conflicts:
	CHANGELOG
	Modulefile
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,6 @@ @@
 +2011-12-30 Puppet Labs <[email protected]> - 2.1.2
 +* Documentation only release for PE 2.0.x
++
 -11-08 Puppet Labs <[email protected]> - 2.2.0
 * #10285 - Refactor json to use pson instead.
 * Maint  - Add watchr autotest script