summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node.rb
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-11-03 20:00:46 -0700
committerJesse Wolfe <jes5199@gmail.com>2010-11-03 20:04:31 -0700
commit7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b (patch)
tree2ca24f5af952c5ef5456ec85ad4fe9e5acf14ac3 /lib/puppet/node.rb
parent9e2a0e41dfb253a19180aeea6b66f65ca8d63133 (diff)
parent4d3c41ee5316285bb0df38aeeb76746016803c16 (diff)
downloadpuppet-7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b.tar.gz
puppet-7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b.tar.xz
puppet-7236a33d6c5c9fbb0f46ffd7826965dbaae6a39b.zip
Merge branch 'next'
This marks the end of our first agile iteration.
Diffstat (limited to 'lib/puppet/node.rb')
-rw-r--r--lib/puppet/node.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
index 2453cd1d5..e8d58e6be 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -3,6 +3,7 @@ require 'puppet/indirector'
# A class for managing nodes, including their facts and environment.
class Puppet::Node
require 'puppet/node/facts'
+ require 'puppet/node/inventory'
require 'puppet/node/environment'
# Set up indirection, so that nodes can be looked for in