diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-08 01:39:39 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-02-08 01:39:39 +0000 |
| commit | 7e07e3dc843798bdbc7a03428ca054adaff2fb72 (patch) | |
| tree | 34d0f9f8c2ee11bdc281e6e4d18cad444253fe36 /bin/puppet | |
| parent | 6d8068eddd0d29ec53f62557eb53f6ebb8e40591 (diff) | |
| download | puppet-7e07e3dc843798bdbc7a03428ca054adaff2fb72.tar.gz puppet-7e07e3dc843798bdbc7a03428ca054adaff2fb72.tar.xz puppet-7e07e3dc843798bdbc7a03428ca054adaff2fb72.zip | |
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
Diffstat (limited to 'bin/puppet')
| -rwxr-xr-x | bin/puppet | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/puppet b/bin/puppet index 609a6e2e4..492c7f88b 100755 --- a/bin/puppet +++ b/bin/puppet @@ -60,8 +60,8 @@ # Licensed under the GNU Public License require 'puppet' -require 'puppet/server' -require 'puppet/client' +require 'puppet/network/server' +require 'puppet/network/client' require 'getoptlong' options = [ @@ -179,8 +179,8 @@ if loadclasses end begin - server = Puppet::Server::Master.new(master) - client = Puppet::Client::MasterClient.new( + server = Puppet::Network::Server::Master.new(master) + client = Puppet::Network::Client::MasterClient.new( :Master => server, :Cache => false ) |