summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-03-12 17:45:35 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-03-12 17:45:35 -0700
commitf74705d6215dc1e9ce0b055e11702b3ea20b9ca5 (patch)
tree1e60c5dd3e418ecbb65ed825c7369d22235ede2c
parentced1f7476e562fea8241469471c715778f3b8157 (diff)
parentf7b8ab71cc869e944792d646e31136d590004850 (diff)
Merge branch '2.3.x'
* 2.3.x: Update CHANGELOG, Modulefile for 2.3.0 release
-rw-r--r--CHANGELOG4
-rw-r--r--Modulefile2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 318cbe9..5dc7b1b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+2012-03-12 Puppet Labs <support@puppetlabs.com> - 2.3.0
+* Add a large number of new Puppet functions
+* Backwards compatibility preserved with 2.2.x
+
2011-12-30 Puppet Labs <support@puppetlabs.com> - 2.2.1
* Documentation only release for the Forge
diff --git a/Modulefile b/Modulefile
index 3efa8b9..432b0e1 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
name 'puppetlabs-stdlib'
-version '2.2.1'
+version '2.3.0'
source 'git://github.com/puppetlabs/puppetlabs-stdlib'
author 'puppetlabs'
license 'Apache 2.0'