summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-11-08 14:16:11 -0800
committerJames Turnbull <james@lovedthanlost.net>2011-11-08 14:16:11 -0800
commit051764b3a108d362fec3e5ff1772e5e2f5ac9376 (patch)
treef9c29d9beb1be92df1bcce9b73210edb3dea9455
parent97d1c692f11b841754816d3f83f2c7cebf6e649d (diff)
* v2.x:
Update CHANGELOG and Modulefile for v2.2.0
-rw-r--r--CHANGELOG6
-rw-r--r--Modulefile2
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1cbf8af..dff036b 100644
--- 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
index 3353929..20ddad2 100644
--- 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'