summaryrefslogtreecommitdiffstats
path: root/lib/puppet/client
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-01 22:28:27 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-03-01 22:28:27 +0000
commit179779dc5045259aa28f0a9cd052d2e41cf8aa96 (patch)
treeab27ba4a6235bf5b53c90a5bff6de274811cc551 /lib/puppet/client
parent457492836e092374895122e69fa067299bf112ff (diff)
downloadpuppet-179779dc5045259aa28f0a9cd052d2e41cf8aa96.tar.gz
puppet-179779dc5045259aa28f0a9cd052d2e41cf8aa96.tar.xz
puppet-179779dc5045259aa28f0a9cd052d2e41cf8aa96.zip
Changing the setdefaults input format somewhat. It is always a hash of some kind now.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@962 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/client')
-rw-r--r--lib/puppet/client/master.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/client/master.rb b/lib/puppet/client/master.rb
index be7f3748d..f9694fb3d 100644
--- a/lib/puppet/client/master.rb
+++ b/lib/puppet/client/master.rb
@@ -1,7 +1,7 @@
# The client for interacting with the puppetmaster config server.
class Puppet::Client::MasterClient < Puppet::Client
Puppet.setdefaults("puppetd",
- [:puppetdlockfile, "$statedir/puppetdlock",
+ :puppetdlockfile => [ "$statedir/puppetdlock",
"A lock file to temporarily stop puppetd from doing anything."]
)