diff options
author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-21 23:12:51 +0000 |
---|---|---|
committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-07-21 23:12:51 +0000 |
commit | b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00 (patch) | |
tree | 45a3eba8dad449b525af4a0a9602318b62d17190 /lib/puppet/server | |
parent | 9e61510ac96cc53b2fbc58efa969499eb0c0c11f (diff) | |
download | puppet-b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00.tar.gz puppet-b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00.tar.xz puppet-b42eaee1a7e8dd1ef7a7daad5d0b03aba6113d00.zip |
First round of bugfixes in preparation for 0.18.4
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1421 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/server')
-rw-r--r-- | lib/puppet/server/master.rb | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/lib/puppet/server/master.rb b/lib/puppet/server/master.rb index 1c5715a60..72f7e7abf 100644 --- a/lib/puppet/server/master.rb +++ b/lib/puppet/server/master.rb @@ -36,14 +36,6 @@ class Server end end - def filetimeout - @interpreter.filetimeout - end - - def filetimeout=(int) - @interpreter.filetimeout = int - end - # Tell a client whether there's a fresh config for it def freshness(client = nil, clientip = nil) if defined? @interpreter @@ -77,8 +69,6 @@ class Server @ca = nil end - args[:ParseCheck] = hash[:FileTimeout] || 15 - Puppet.debug("Creating interpreter") if hash.include?(:UseNodes) |