[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 e15d316cbb9ee33bfbed4b29649f36a97490e985
Author: Nigel Kersten <nigelk at google.com>
Date:   Wed Sep 3 10:28:17 2008 -0700

    Fixes #1551 puppetmaster.freshness xmlrpc call returns incorrect type

diff --git a/CHANGELOG b/CHANGELOG
index 5b9ad4c..15f681e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
 0.24.x
+    Fixes #1551 puppetmaster.freshness xmlrpc call returns incorrect type
+
     Fixes #1554 - Fix exception for undefined hostname
 
     Fixed #1533 - changed permissions for man directory
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 9682c46..05ae7b9 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -24,7 +24,7 @@ class Puppet::Network::Handler
         # Tell a client whether there's a fresh config for it
         def freshness(client = nil, clientip = nil)
             # Always force a recompile.  Newer clients shouldn't do this (as of April 2008).
-            Time.now
+            return 0
         end
 
         def initialize(hash = {})

-- 
Puppet packaging for Debian