diff options
| author | Max Martin <max@puppetlabs.com> | 2011-04-07 11:29:54 -0700 |
|---|---|---|
| committer | Max Martin <max@puppetlabs.com> | 2011-04-07 11:29:54 -0700 |
| commit | da4457be4dedaed5368bacf81a08f0429e21cd45 (patch) | |
| tree | 5c6149ed872d33f1f6711bac8a5b43f6dbd71a4a /lib/puppet/node | |
| parent | 1e4968e82a65b21ad5d075015830ef3f54efee05 (diff) | |
| parent | f7c6db9409e479ec1b54cfa85daa1ee51e5a7ad0 (diff) | |
| download | puppet-da4457be4dedaed5368bacf81a08f0429e21cd45.tar.gz puppet-da4457be4dedaed5368bacf81a08f0429e21cd45.tar.xz puppet-da4457be4dedaed5368bacf81a08f0429e21cd45.zip | |
Merge branch '2.6.next' into 2.6.x
* 2.6.next:
Fix #4339 - Locally save the last report to $lastrunreport
Fix #4339 - Save a last run report summary to $statedir/last_run_summary.yaml
Fixed #3127 - removed legacy debug code
Fixed #3127 - Fixed gem selection regex
(#5437) Invalidate cached TypeCollection when there was an error parsing
(#6937) Adjust formatting of recurse's desc
(#6937) Document the recurse parameter of File type.
(#6893) Document the cron type in the case of specials.
(#5670) Don't trigger refresh from a failed resource
Fixed #6554 - Missing $haveftool if/else conditional in install.rb breaking Ruby 1.9
Diffstat (limited to 'lib/puppet/node')
| -rw-r--r-- | lib/puppet/node/environment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index b64fb8a1f..807479bc8 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -79,7 +79,7 @@ class Puppet::Node::Environment # environment has changed do we delve deeper. Thread.current[:known_resource_types] = nil if (krt = Thread.current[:known_resource_types]) && krt.environment != self Thread.current[:known_resource_types] ||= synchronize { - if @known_resource_types.nil? or @known_resource_types.stale? + if @known_resource_types.nil? or @known_resource_types.require_reparse? @known_resource_types = Puppet::Resource::TypeCollection.new(self) @known_resource_types.perform_initial_import end |