From 7e07e3dc843798bdbc7a03428ca054adaff2fb72 Mon Sep 17 00:00:00 2001
From: luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>
Date: Thu, 8 Feb 2007 01:39:39 +0000
Subject: Moving all of the client and server code into a single network/
 directory.  In other words, more code structure cleanup.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2179 980ebf18-57e1-0310-9a29-db15c13687c0
---
 bin/puppetmasterd | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/puppetmasterd')

diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index ecacf480a..83e2b08ed 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -83,7 +83,7 @@ end
 
 require 'getoptlong'
 require 'puppet'
-require 'puppet/server'
+require 'puppet/network/server'
 
 options = [
 	[ "--daemonize", "-D",			GetoptLong::NO_ARGUMENT ],
@@ -230,7 +230,7 @@ end
 
 if Puppet[:parseonly]
     begin
-        Puppet::Server::Master.new(master)
+        Puppet::Network::Server::Master.new(master)
     rescue => detail
         if Puppet[:trace]
             puts detail.backtrace
@@ -256,8 +256,8 @@ args[:Handlers] = handlers
 
 begin
     # use the default, um, everything
-    #server = Puppet::Server.new(:CA => ca)
-    server = Puppet::Server.new(args)
+    #server = Puppet::Network::Server.new(:CA => ca)
+    server = Puppet::Network::Server.new(args)
 rescue => detail
     if Puppet[:trace]
         puts detail.backtrace
-- 
cgit