summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNigel Kersten <nigelk@google.com>2008-09-03 10:28:17 -0700
committerJames Turnbull <james@lovedthanlost.net>2008-09-05 11:50:01 +1000
commite15d316cbb9ee33bfbed4b29649f36a97490e985 (patch)
tree62ecf3eb6b3e592872b7fedc3ba01cdb1714443a
parent8fe033820875966106ab3807aa34a1cafc85cbd2 (diff)
downloadpuppet-e15d316cbb9ee33bfbed4b29649f36a97490e985.tar.gz
puppet-e15d316cbb9ee33bfbed4b29649f36a97490e985.tar.xz
puppet-e15d316cbb9ee33bfbed4b29649f36a97490e985.zip
Fixes #1551 puppetmaster.freshness xmlrpc call returns incorrect type
-rw-r--r--CHANGELOG2
-rw-r--r--lib/puppet/network/handler/master.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5b9ad4c32..15f681e77 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 9682c460e..05ae7b9a2 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 = {})