Merge branch '0.24.x'

Conflicts:

	CHANGELOG
	lib/puppet/type/tidy.rb
	spec/unit/type/file/ensure.rb
	spec/unit/type/tidy.rb

1 files changed, 56 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index aa427efbf..cb918eb62 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,19 +1,58 @@
-0.25.?
-    Fixing #1168 for REST -- all ssl classes downcase their names.
-    This is a much cleaner fix than the xmlrpc version, thankfully. :)
+0.24.7
+    Fixed #1496 - nagios_servicedependency needs a unique host_name?
 
-    Added a boolean 'crl' default value.  Now we have a location for
-    the CA CRL and the host CRL, and then a setting for configuring
-    whether we should even use a CRL.  This way we aren't trying to
-    set file paths to 'false' to disable the CRL.
+    Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
 
-0.24.x
-    Fixed #1695 - Solaris 10 zone provider doesn't properly handle unknown zone attributes in newer releases
+    Bug #1803 Zfs should auto require the ancestor file systems
 
-    Fixed #1776 - Trivial fix for gentoo service provider
+    Refactor #1802 Use 'zfs get -H -o value' instead of parsing output for value
+
+    Fixing #1800 - tidy now correctly ignores missing files and directories
+
+    Fixing #1794 - returning sync when it is already initialized
+
+    Fixing #1750 again - All of the properties and now :ensure check replace?
+
+    Deprecate the NetInfo nameservice provider. Use directoryservice instead
+
+    Add macauthorization type
+
+    Fixing #1703 - using a mutex around the sending of the tagmails
+
+    Fix #1788 - allow rspec rake to run only some tests
+
+    Fixing the AST constant warnings, using a variable instead of a constant
+
+    Feature #1696 Add support for branded zones
+
+    Feature #1783 - Add ZFS support
+
+    type/mcx.rb Feature #1026 - MCX Type
+
+    Fixing #1749 - Splay now hopefully behaves "better" for small values
+
+    Fix #1741 - Add inline_template function
+
+    Slight denormalisation to store a host's environment as a first class
 
     Added Rake :ci namespace and CI tasks
 
+    Refactoring the thread-safety in Puppet::Util
+
+    Removing the included testing gems; you must now install them yourself
+
+    Refactoring of SELinux functions to use native Ruby SELinux interface
+
+    Removing all mention of EPM, RPM, or Sun packages.
+
+    Fixed #1496 - nagios_servicedependency needs a unique host_name?
+
+    Fixed #1420 - nagios_serviceescalation not allowing host_name more than one type
+
+    Fixed #1695 - Solaris 10 zone provider doesn't properly handle unknown zone attributes in newer releases
+
+    Fixed #1776 - Trivial fix for gentoo service provider
+
     Fixed #1767 - Minor fix to emacs mode
 
     Fixed #1711 - fileserver test fails due to incorrect mocking
@@ -65,6 +104,13 @@
     Removed conf/debian directory - Debian packaging information 
     now maintained downstream
 
+    Added augeas type
+
+    Added support for @doc type and manifest documentation support - see:
+    http://reductivelabs.com/trac/puppet/wiki/PuppetManifestDocumentation
+
+    Added multiline comment support
+
 0.24.6
     Adding support to the user type for: profiles, auths, project, 
     key/value pairs (extension to Solaris RBAC support added in