summaryrefslogtreecommitdiffstats
path: root/lib/puppet/node
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2011-03-03 16:58:07 -0800
committerNick Lewis <nick@puppetlabs.com>2011-03-03 16:58:07 -0800
commitc65ef89e533e73d0f9ec34244be630bae00b53d5 (patch)
treeeb68cab014a36166326e5a20d9df47aa0e14ab3e /lib/puppet/node
parentf519899dacab51c23db3ecf043feb481d1aa4bc1 (diff)
parentc3baa2899d88fadd4bbe94e008015e33f98132c7 (diff)
downloadpuppet-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')
-rw-r--r--lib/puppet/node/inventory.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/puppet/node/inventory.rb b/lib/puppet/node/inventory.rb
deleted file mode 100644
index fd99163b0..000000000
--- a/lib/puppet/node/inventory.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'puppet/node'
-require 'puppet/indirector'
-
-class Puppet::Node::Inventory
- extend Puppet::Indirector
- indirects :inventory, :terminus_setting => :inventory_terminus
-end