summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff McCune <jeff@puppetlabs.com>2012-08-14 15:08:13 -0700
committerJeff McCune <jeff@puppetlabs.com>2012-08-14 15:08:13 -0700
commit53243605b28fc31618d079155c86b37b4e88a6ca (patch)
tree509ab68f7c1d4f258cd9d853ada0e6414a83c64d
parent1076aa05456e5303148dd3938787735b47fa391e (diff)
parent46daf0fb6db19287c5021c1d065f462da237920c (diff)
downloadpuppet-stdlib-53243605b28fc31618d079155c86b37b4e88a6ca.tar.gz
puppet-stdlib-53243605b28fc31618d079155c86b37b4e88a6ca.tar.bz2
Merge branch '2.4.x'
* 2.4.x: Update Modulefile, CHANGELOG for 2.4.0
-rw-r--r--CHANGELOG15
-rw-r--r--Modulefile2
2 files changed, 16 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2ff34d0..aa56323 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,18 @@
+2012-06-07 - Chris Price <chris@puppetlabs.com> - 2.4.0
+ * Add support for a 'match' parameter to file_line (a06c0d8)
+
+2012-08-07 - Erik Dalén <dalen@spotify.com> - 2.4.0
+ * (#15872) Add to_bytes function (247b69c)
+
+2012-07-19 - Jeff McCune <jeff@puppetlabs.com> - 2.4.0
+ * (Maint) use PuppetlabsSpec::PuppetInternals.scope (master) (deafe88)
+
+2012-07-10 - Hailee Kenney <hailee@puppetlabs.com> - 2.4.0
+ * (#2157) Make facts_dot_d compatible with external facts (5fb0ddc)
+
+2012-03-16 - Steve Traylen <steve.traylen@cern.ch> - 2.4.0
+ * (#13205) Rotate array/string randomley based on fqdn, fqdn_rotate() (fef247b)
+
2012-05-22 - Peter Meier <peter.meier@immerda.ch> - 2.3.3
* fix regression in #11017 properly (f0a62c7)
diff --git a/Modulefile b/Modulefile
index 6112055..146dbb9 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,5 +1,5 @@
name 'puppetlabs-stdlib'
-version '2.3.3'
+version '2.4.0'
source 'git://github.com/puppetlabs/puppetlabs-stdlib'
author 'puppetlabs'
license 'Apache 2.0'