summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-04-19 17:37:51 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitf9783fcdee928c80339b2b1567350b2450e1ea05 (patch)
tree4d2c54a850d53da5b5e3eae84d50857323bf2069 /sbin
parent1d8bd0d9308413b2f0772a65ee76d69d8fa5959b (diff)
downloadpuppet-f9783fcdee928c80339b2b1567350b2450e1ea05.tar.gz
puppet-f9783fcdee928c80339b2b1567350b2450e1ea05.tar.xz
puppet-f9783fcdee928c80339b2b1567350b2450e1ea05.zip
feature #2276 Single Executable: "puppet master"
Add "puppet master" as the new invocation of "puppetmasterd" Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
Diffstat (limited to 'sbin')
-rwxr-xr-xsbin/puppetmasterd4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/puppetmasterd b/sbin/puppetmasterd
index c38c64828..454703bc7 100755
--- a/sbin/puppetmasterd
+++ b/sbin/puppetmasterd
@@ -62,5 +62,5 @@
# Copyright (c) 2005 Reductive Labs, LLC
# Licensed under the GNU Public License
-require 'puppet/application/server'
-Puppet::Application[:server].run
+require 'puppet/application/master'
+Puppet::Application[:master].run