summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/application/master.rb (renamed from lib/puppet/application/server.rb)4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/application/server.rb b/lib/puppet/application/master.rb
index 7aeb6ad5d..8f1c0cd95 100644
--- a/lib/puppet/application/server.rb
+++ b/lib/puppet/application/master.rb
@@ -4,7 +4,7 @@ require 'puppet/daemon'
require 'puppet/network/server'
require 'puppet/network/http/rack' if Puppet.features.rack?
-Puppet::Application.new(:server) do
+Puppet::Application.new(:master) do
should_parse_config
@@ -115,7 +115,7 @@ Puppet::Application.new(:server) do
@app = Puppet::Network::HTTP::Rack.new(:xmlrpc_handlers => xmlrpc_handlers, :protocols => [:rest, :xmlrpc])
end
- Puppet.notice "Starting Puppet server version %s" % [Puppet.version]
+ Puppet.notice "Starting Puppet master version %s" % [Puppet.version]
unless options[:rack]
@daemon.start