diff options
| author | Paul Berry <paul@puppetlabs.com> | 2011-02-17 15:37:12 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2011-02-17 15:37:26 -0800 |
| commit | 6d5f1aa75c8c64033b56f49e87fc03258d5c158c (patch) | |
| tree | 13280ce802707d5a8d52e2d7a06d5ab2610d496d /lib/puppet/node.rb | |
| parent | ab27da7967e1e145d5fbc130e5fbcec6795ca775 (diff) | |
| parent | 8a485608e2941ff8c7ecc706c21f906d59302dd6 (diff) | |
| download | puppet-6d5f1aa75c8c64033b56f49e87fc03258d5c158c.tar.gz puppet-6d5f1aa75c8c64033b56f49e87fc03258d5c158c.tar.xz puppet-6d5f1aa75c8c64033b56f49e87fc03258d5c158c.zip | |
Merge branch 'ticket/2.6.next/6338' into 2.6.next
* ticket/2.6.next/6338:
(#5150) Make fact REST terminus configurable to connect to inventory service
(#5166) Inventory service is now searchable by timestamp.
Maint: backport timestamp accessor for facts from 2.7 branch
Refactored Puppet::Node::Inventory::Yaml tests in preparation for adding freshness check
Refactor Puppet::Node::Inventory::Yaml in preparation for adding freshness
(#5132) Provide a query REST interface for inventory
Diffstat (limited to 'lib/puppet/node.rb')
| -rw-r--r-- | lib/puppet/node.rb | 1 |
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 |