diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-03-15 10:30:52 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-03-15 10:30:52 -0700 |
| commit | 5d3aa54d86a7b9a2c089b2dbff0778d928853666 (patch) | |
| tree | fea81f0108b52e9305bebefe47f44a0e9e6e52ca /lib | |
| parent | 6260687ee00f409c4b718f7e6f244ae844dab7d3 (diff) | |
| parent | 093f1627025a69f1c0a1b570139147e6fc843d2c (diff) | |
| download | puppet-5d3aa54d86a7b9a2c089b2dbff0778d928853666.tar.gz puppet-5d3aa54d86a7b9a2c089b2dbff0778d928853666.tar.xz puppet-5d3aa54d86a7b9a2c089b2dbff0778d928853666.zip | |
Merge branch 'ticket/2.6.next/6689' into 2.6.next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/indirector/facts/inventory_active_record.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/puppet/indirector/facts/inventory_active_record.rb b/lib/puppet/indirector/facts/inventory_active_record.rb index 5d130eae2..db4c63f00 100644 --- a/lib/puppet/indirector/facts/inventory_active_record.rb +++ b/lib/puppet/indirector/facts/inventory_active_record.rb @@ -4,7 +4,6 @@ require 'puppet/rails/inventory_fact' require 'puppet/indirector/active_record' class Puppet::Node::Facts::InventoryActiveRecord < Puppet::Indirector::ActiveRecord - include Puppet::Util def find(request) node = Puppet::Rails::InventoryNode.find_by_name(request.key) return nil unless node |