diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:49:54 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:50:26 -0700 |
| commit | 21afb51a1b84116b2a906a6959ae588f45135104 (patch) | |
| tree | 48fa0438d0a50202194956344d0cf1f10b17b818 /lib/puppet/daemon.rb | |
| parent | 1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac (diff) | |
| parent | 8be1929043f4560bb17a4b06293b3f9a4efcfdbf (diff) | |
| download | puppet-21afb51a1b84116b2a906a6959ae588f45135104.tar.gz puppet-21afb51a1b84116b2a906a6959ae588f45135104.tar.xz puppet-21afb51a1b84116b2a906a6959ae588f45135104.zip | |
Merge commit '2.6.1rc3'
This synchronizes the 2.7 master branch with 2.6.1RC3
The 2.7 next branch has now diverged from master for the first time, as
if contains code that has not reached "release quality" status.
Diffstat (limited to 'lib/puppet/daemon.rb')
| -rwxr-xr-x | lib/puppet/daemon.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb index aa4a12bfa..ad0edd3b9 100755 --- a/lib/puppet/daemon.rb +++ b/lib/puppet/daemon.rb @@ -121,8 +121,8 @@ class Puppet::Daemon create_pidfile raise Puppet::DevError, "Daemons must have an agent, server, or both" unless agent or server - agent.start if agent server.start if server + agent.start if agent EventLoop.current.run end |