From a6e2beaba1565a87bbd5266154883b72a700b3f3 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Sat, 2 Oct 2010 12:23:23 +1000
Subject: Fixed #4919 - added parenths to fix error message:

/usr/lib/ruby/site_ruby/1.8/puppet/util/metric.rb:62: warning: parenthesize argument(s) for future version
---
 lib/puppet/util/metric.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb
index 00898472f..90a244836 100644
--- a/lib/puppet/util/metric.rb
+++ b/lib/puppet/util/metric.rb
@@ -59,7 +59,7 @@ class Puppet::Util::Metric
     if Puppet.features.rrd_legacy? && ! Puppet.features.rrd?
       puts @rrd.info
     else
-      puts RRD.info self.path
+      puts RRD.info(self.path)
     end
   end
 
-- 
cgit 


From 55417bc454132bc8c48ff98d5092baa85f94d6ed Mon Sep 17 00:00:00 2001
From: Markus Roberts <Markus@reality.com>
Date: Tue, 5 Oct 2010 16:07:35 -0700
Subject: Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6

This fix for #3707 was incorrect & just moved the problem (see #4929).
---
 lib/puppet/provider/package/rpm.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb
index ec6121743..72dc260a4 100755
--- a/lib/puppet/provider/package/rpm.rb
+++ b/lib/puppet/provider/package/rpm.rb
@@ -60,8 +60,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     begin
       output = rpm(*cmd)
     rescue Puppet::ExecutionFailure
-      # rpm exits 1 if the package is not found.
-      return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}    
+      return nil
     end
 
     # FIXME: We could actually be getting back multiple packages
-- 
cgit 


From 1d719bee75e10657c8b31a4672fe24c12a235d4d Mon Sep 17 00:00:00 2001
From: Markus Roberts <Markus@reality.com>
Date: Wed, 6 Oct 2010 15:25:20 -0700
Subject: Fix for #4945 -- explicitly check os to supress man page installation

The fix for #4644 usurped an existing option flag to supress the installation
of man pages on Microsoft Windows, when the desired behaviour was to only skip
the installation on MSWin and not change the behaviour on other platforms.
This patch implements the check explicitly to correctly express the desired
behaviour.
---
 install.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install.rb b/install.rb
index 449223d26..f7541c854 100755
--- a/install.rb
+++ b/install.rb
@@ -462,4 +462,4 @@ prepare_installation
 do_bins(sbins, InstallOptions.sbin_dir)
 do_bins(bins, InstallOptions.bin_dir)
 do_libs(libs)
-do_man(man) if InstallOptions.man
+do_man(man) unless $operatingsystem == "windows"
-- 
cgit 


From 295c3be532b01a3ab58411b32b489730922d1c75 Mon Sep 17 00:00:00 2001
From: James Turnbull <james@lovedthanlost.net>
Date: Fri, 8 Oct 2010 06:13:25 +1100
Subject: Updated CHANGELOG for 2.6.2

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4cfa97d83..f0c596ee5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
+2.6.2
+=====
+1d719be  Fix for #4945 -- explicitly check os to supress man page installation
+55417bc  Reversion of 021d534482dd8edb863cb77d668ac3525362a0a6
+a6e2bea  Fixed #4919 - added parenths to fix error message:
+
 2.6.2rc1
 ========
+917c520  Incremented version to 2.6.2
+900eae4  Updated CHANGELOG for 2.6.2rc1
 1b6094d  Fixed documentation typo
 bdf12fe  Fix for #4896 -- stray newline left over from removed diagnostic
 e7424c6  (#4772) Update SuSE .spec file
-- 
cgit