summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/handler/master.rb
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-05 00:08:15 -0500
committerLuke Kanies <luke@madstop.com>2007-10-05 00:08:15 -0500
commit275af562b462813ddf5ddbad2192ddc2bf57770c (patch)
treeaceabf68095b8c34fd599f245022a9aaab0984da /lib/puppet/network/handler/master.rb
parentce0178316d8cefd072f53d39b59ce47332f6ec8f (diff)
parent29accba1b9343f4967c15d36506b3bf60d5f0f9c (diff)
downloadpuppet-275af562b462813ddf5ddbad2192ddc2bf57770c.tar.gz
puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.tar.xz
puppet-275af562b462813ddf5ddbad2192ddc2bf57770c.zip
Merge branch 'routing' of http://git.rickbradley.com/puppet into routing
Diffstat (limited to 'lib/puppet/network/handler/master.rb')
-rw-r--r--lib/puppet/network/handler/master.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 030950c61..25c4318b8 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -77,12 +77,7 @@ class Puppet::Network::Handler
Puppet::Node::Facts.new(client, facts).save
# And get the configuration from the config handler
- begin
- config = config_handler.configuration(client)
- rescue => detail
- puts detail.backtrace
- raise
- end
+ config = config_handler.configuration(client)
return translate(config.extract)
end