Merge branch '2.6.next' into next

This was a particularly nasty merge, so rather than hold up merges into
next any longer, I'm going to push this merge with a few outstanding
problems.  The tests that were failing in the following areas have been
marked pending, and will be addressed separately, immediately following
this push.

TODO:
Verify that brice's rdoc change is still valid: tests to show that line
  numbers from class, define and node get into the ast
Fix mount parsed_spec spec/unit/provider/mount/parsed_spec.rb

* 2.6.next: (85 commits)
  (#5148) Fix failing spec due to timezone
  (#5148) Add support for PSON to facts
  (#6338) Remove inventory indirection, and move to facts indirection
  (#6445) Fix inline docs: puppet agent does not accept --mkusers
  Update CHANGELOG and version for 2.6.6rc1
  (#6541) Fix content with checksum truncation bug
  (#6418) Recursive files shouldn't be audited
  (#6541) maint: whitespace cleanup on the file integration spec
  (#6541) Fix content with checksum truncation bug
  (#5466) Write specs for output of puppet resource
  (#5466) Monkey patch Symbol so that you can sort them
  (#5466) Fixed puppet resource bug with trailing ,
  Update CHANGELOG for 2.6.5
  (#4922) Don't truncate remotely-sourced files on 404
  (#6338) Remove unused version control tags
  Maint: Align tabs in a code block in the Augeas type.
  (#6509) Inline docs: Fix erroneous code block in directoryservice provider for computer type
  Maint: Rewrite comments about symlinks to reflect best practice.
  (#6509) Inline docs: Fix broken lists in Launchd provider.
  (#6509) Inline docs: Fix broken code blocks in zpool type
  ...

Manually Resolved Conflicts:
  lib/puppet/application/inspect.rb
  lib/puppet/defaults.rb
  lib/puppet/file_bucket/dipper.rb
  lib/puppet/network/http/handler.rb
  lib/puppet/node/facts.rb
  lib/puppet/parser/parser.rb
  lib/puppet/parser/parser_support.rb
  lib/puppet/util/command_line/puppet
  lib/puppet/util/command_line/puppetd
  lib/puppet/util/command_line/puppetmasterd
  lib/puppet/util/monkey_patches.rb
  lib/puppet/util/rdoc/parser.rb
  spec/unit/application/agent_spec.rb
  spec/unit/file_bucket/file_spec.rb
  spec/unit/indirector/file_bucket_file/file_spec.rb
  spec/unit/network/http/handler_spec.rb
  spec/unit/parser/parser_spec.rb
  spec/unit/provider/mount/parsed_spec.rb

1 files changed, 26 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index cd503a1c3..c08d7e72f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,29 @@
-2.6.5rc1
+2.6.6rc1
 ========
+7c2a980 (#6541) Fix content with checksum truncation bug
+63e911f (#6418) Recursive files shouldn't be audited
+
+2.6.5
+=====
+30fa41d Updated CHANGELOG for 2.6.5rc5
+b481321 (#6337) Fix Ruby warning on 1.8.6 about "future compatibility"
+dcce45c (#6353) Restore the ability to store paths in the filebucket
+0450197 (#6126) Puppet inspect now reports status after run completes.
+960890f (#6364) Adjust mis-translated regex in mount provider for AIX
+9e0f9c5 Updated CHANGELOG for 2.6.5rc4
+664ef67 (#3646) Fix the documentation fix for `puppet apply --apply`
+4b6519a Updated CHANGELOG for 2.6.5rc3
+7ef2fbf Updated fix for #3646 - apply / compile documentation
+193016d (#5977) fix spec test failure when new applications are introduced.
+c08fc1b Updated CHANGELOG for 2.6.5rc2
+1f89906 (#6257) Speed up PUT and POST requests under rack
+70a43c4 Updated CHANGELOG and version for 2.6.5rc1
+f108f03 (#6018) Nick F's --help text for puppet inspect.
+04ea826 (#5823) document the not-an-API status of set_run_mode
+4ff5769 (#5823) run mode can now be set dynamically...
+bddfa1e (6114) Update the audit metaparameter for 2.6.5.
+ac8d316 Fix for #5755 -- making zaml serialization robust over projected objects
+c912a2a (#4139) hook log autoflush into global defaults
 f9e2e2b Augmentation of tests for prior commit
 392504a Fix to fix for #5755 -- backref serialization issues in zaml
 a732a15 Fixed #5564 - Added some more fqdn_rand documentation
@@ -45,6 +69,7 @@ ae48634 Fixed #5914 Removed genconfig = true from genconfig output
 e58f5dc Fixed #5742 - Removed legacy fqdn option from documentation
 4d1b51f Fixed #5167 - misleading documentation in the defaults of [main]
 c1b5c7f (#5913) Fix Puppet::Application.find constant lookup behavior
+7b3b56e (5977) Puppet::Applications can be loaded from multiple paths.
 f9bfb96 (#5900) Include ResourceStatus#failed in serialized reports
 79b6332 (#5882) Added error-handling for bucketing files in puppet inspect
 17843d5 (#5882) Added error-handling to puppet inspect when auditing