diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-03-03 16:58:07 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-03-03 16:58:07 -0800 |
| commit | c65ef89e533e73d0f9ec34244be630bae00b53d5 (patch) | |
| tree | eb68cab014a36166326e5a20d9df47aa0e14ab3e /lib/puppet/node.rb | |
| parent | f519899dacab51c23db3ecf043feb481d1aa4bc1 (diff) | |
| parent | c3baa2899d88fadd4bbe94e008015e33f98132c7 (diff) | |
| download | puppet-c65ef89e533e73d0f9ec34244be630bae00b53d5.tar.gz puppet-c65ef89e533e73d0f9ec34244be630bae00b53d5.tar.xz puppet-c65ef89e533e73d0f9ec34244be630bae00b53d5.zip | |
Merge branch 'ticket/2.6.next/6581' into 2.6.next
Diffstat (limited to 'lib/puppet/node.rb')
| -rw-r--r-- | lib/puppet/node.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb index e8d58e6be..2453cd1d5 100644 --- a/lib/puppet/node.rb +++ b/lib/puppet/node.rb @@ -3,7 +3,6 @@ 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 |