Merge branch '2.6.x' into next

* 2.6.x:
  (maint) Indentation fixes
  (#6490) Add plugin initialization callback system to core
  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

Conflicts (Manually resolved):
	lib/puppet/application/agent.rb
	lib/puppet/application/apply.rb
	lib/puppet/configurer.rb
	lib/puppet/resource/type_collection.rb
	lib/puppet/type/file.rb
	spec/integration/configurer_spec.rb
	spec/unit/application/agent_spec.rb
	spec/unit/application/apply_spec.rb
	spec/unit/configurer_spec.rb
	spec/unit/indirector/report/yaml_spec.rb
	spec/unit/resource/type_collection_spec.rb

Paired-with: Nick Lewis

0 files changed, 0 insertions, 0 deletions