Merge pull request puppetlabs#21 from puppetlabs/v2.2

ghoneycutt · ghoneycutt · commit 1434f3cea6f6 · 2011-11-08T14:20:09.000-08:00
* v2.x:
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+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
diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name    'puppetlabs-stdlib'
-version '2.1.1'
+version '2.2.0'
 source 'git://github.com/puppetlabs/puppetlabs-stdlib'
 author 'puppetlabs'
 license 'Apache 2.0'
