[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 50ac03a2a404faa60fe0774a608397b3e4448b9b
Author: James Turnbull <james at lovedthanlost.net>
Date:   Tue Dec 9 14:18:31 2008 +1100

    CHANGELOG updates

diff --git a/CHANGELOG b/CHANGELOG
index cdff75c..4daa9f5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,46 @@
-0.24.x
+0.24.7
+    Bug #1803 Zfs should auto require the ancestor file systems
+
+    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
@@ -7,8 +49,6 @@
 
     Fixed #1776 - Trivial fix for gentoo service provider
 
-    Added Rake :ci namespace and CI tasks
-
     Fixed #1767 - Minor fix to emacs mode
 
     Fixed #1711 - fileserver test fails due to incorrect mocking
@@ -60,6 +100,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
diff --git a/Rakefile b/Rakefile
index 7175c3e..21d7651 100644
--- a/Rakefile
+++ b/Rakefile
@@ -217,10 +217,9 @@ end
       mkdir(CHANGELOG_DIR) unless File.directory?(CHANGELOG_DIR)
  
       change_body=`git log --pretty=format:'%aD%n%an <%ae>%n%s%n'`
-      version = version + "\n"
 
       File.open(File.join(CHANGELOG_DIR, "CHANGELOG.git"), 'w') do |f|
-        f << version << change_body 
+        f << change_body 
       end
  
       # Changelog commit

-- 
Puppet packaging for Debian