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

1 files changed, 3 insertions, 3 deletions

diff --git a/bin/puppetrun b/bin/puppetrun
index 8df673eea..a432fe01d 100755
--- a/bin/puppetrun
+++ b/bin/puppetrun
@@ -137,8 +137,8 @@ rescue LoadError
     $stderr.puts "Failed to load ruby LDAP library. LDAP functionality will not be available"
 end
 require 'puppet'
-require 'puppet/server'
-require 'puppet/client'
+require 'puppet/network/server'
+require 'puppet/network/client'
 require 'getoptlong'
 
 
@@ -340,7 +340,7 @@ while go
                 $stderr.print "Could not contact %s\n" % host
                 next
             end
-            client = Puppet::Client::Runner.new(
+            client = Puppet::Network::Client::Runner.new(
                 :Server => host,
                 :Port => Puppet[:puppetport]
             )