Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	test/util/posixtest.rb

1 files changed, 47 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 8b2bd3349..33fd47dc9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,51 @@
     whether we should even use a CRL.  This way we aren't trying to
     set file paths to 'false' to disable the CRL.
 
+0.24.x
+    Fixed #1502 - Fixed poor stored configuration performance
+
+    Fixed #1510 - Storeconfiguration fixed for Rails 2.1
+
+    Add the -P/--ping option to puppetrun, fixes #1501
+
+    Fixed #1394 - Added stored configuration clearing script to /ext
+    
+    Fixed #1442 - replaced use of Facter for report titling with certname
+
+    Fixed $1456 - add proxy configuration capability to yum repo
+
+    Fixed #1457 - removed confine warning
+
+    A working script to create an OS X pkg out of the Puppet repository
+
+    Fixed #1441 - Updated console colours
+
+    Expose all puppet variables as instance member variables of the template wrapper.
+    This helps resolve redmine #1427, by providing a safe mechanism to access variables.
+    
+     * Implement Puppet::Parser::Scope#to_hash, which returns a hash containing all the
+       variable bindings in the current and, optionally, parent scope.
+     * Use that to set instance member variables into Puppet::Parser::Templatewrapper
+     * Report the time taken for variable binding at debug level, to help identify any
+       performance regression that is encountered in the real world.
+     * Rename the @scope and @file members of the template wrapper, to avoid clashing
+       with a scope variable exposed within puppet.
+
+    Ensure that we consistently use either string #{} interpolation or String.%
+    interpolation, not both, to avoid issues where a #{} interpolated value
+    contains a % character.
+
+    Feature #1476: Allow specification of --bindir --sbindir --sitelibdir --mandir --destdir 
+    in installation
+    
+    Added feature #1241 : Improve performance of group lookups
+
+    Fixed bug #1448: Puppet CA incorrectly writes out all certs to inventory .txt on each 
+    certificate signing
+
+    Fixing puppetlast to make it work with 0.24.5 / 0.25.  Made puppetlast work on 0.24.5 
+    by using the YAML indirector
+ 
 0.24.5
     You can now select the encoding format when transferring the catalog,
     with 'yaml' still being the default but 'marshal' being an option.
@@ -22,6 +67,8 @@
     The fix for #1431 is actually just removing the tests that exposed
     this change; the change happened when I refactored how confines work.
 
+    Removed faulty interface type
+
     Updated /spec/unit/rails.rb test
 
     Fix #1426 - services on redhat are restarted again and status is