diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-06 19:03:05 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-06 19:03:05 +0000 |
| commit | 46d344b9daa24047b60183cc94509d306b6b562a (patch) | |
| tree | 3c11eaad696ba3d6e6dd40bd7b9e7d1a4a71af85 /bin/puppet | |
| parent | 68233706a9ff05be8fa8ab3ab7198cd0918517d6 (diff) | |
| download | puppet-46d344b9daa24047b60183cc94509d306b6b562a.tar.gz puppet-46d344b9daa24047b60183cc94509d306b6b562a.tar.xz puppet-46d344b9daa24047b60183cc94509d306b6b562a.zip | |
Merging the webserver_portability branch from version 2182 to version 2258.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2259 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'bin/puppet')
| -rwxr-xr-x | bin/puppet | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/puppet b/bin/puppet index 492c7f88b..0e3ca0f0a 100755 --- a/bin/puppet +++ b/bin/puppet @@ -60,7 +60,7 @@ # Licensed under the GNU Public License require 'puppet' -require 'puppet/network/server' +require 'puppet/network/handler' require 'puppet/network/client' require 'getoptlong' @@ -179,8 +179,8 @@ if loadclasses end begin - server = Puppet::Network::Server::Master.new(master) - client = Puppet::Network::Client::MasterClient.new( + server = Puppet::Network::Handler.master.new(master) + client = Puppet::Network::Client.master.new( :Master => server, :Cache => false ) |