summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--lib/puppet.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d9cbe7697..15b41b1b9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,5 @@
+ Puppetd once again correctly responds to HUP.
+
Added a syntax for referring to variables defined in
other classes (e.g., $puppet::server).
diff --git a/lib/puppet.rb b/lib/puppet.rb
index cabf85bd2..f1b080b35 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -204,7 +204,7 @@ module Puppet
# Handle restarting.
trap(:HUP) do
- if client = @services.find { |s| s.is_a? Puppet::Network::Client::MasterClient } and client.running?
+ if client = @services.find { |s| s.is_a? Puppet::Network::Client::Master } and client.running?
client.restart
else
Puppet.restart