summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node.rb
diff options
context:
space:
mode:
authorPaul Berry <paul@puppetlabs.com>2010-11-29 14:33:49 -0800
committerPaul Berry <paul@puppetlabs.com>2010-11-29 14:33:49 -0800
commitcb6e9c990945501962bf9bf864309e8e6f83b827 (patch)
tree7109f1605e4dceca9e48ef58b41bda559ba4901d /lib/puppet/node.rb
parent52f9ef06507d87026936dc90dcb467a728ebd54f (diff)
parent71ecad9904c8c48c023e90e5fbea5b26b180c9cf (diff)
Merge branch 'maint/next/remove_indirection_delegation' into next
* maint/next/remove_indirection_delegation: Maint: Refactor code to use <class>.indirection.<method> Maint: Refactor tests to use <class>.indirection.<method>
Diffstat (limited to 'lib/puppet/node.rb')
-rw-r--r--lib/puppet/node.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
index e8d58e6be..5b0a98615 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -57,7 +57,7 @@ class Puppet::Node
# Merge the node facts with parameters from the node source.
def fact_merge
- if facts = Puppet::Node::Facts.find(name)
+ if facts = Puppet::Node::Facts.indirection.find(name)
merge(facts.values)
end
rescue => detail