Merge branch 'next'

* next: (198 commits)
  (#6722) load all functions before testing...
  Updated CHANGELOG for 2.6.7rc1
  (#5073) Download plugins even if you're filtering on tags
  Fix #5610: Prevent unnecessary RAL lookups
  Revert "Merge branch 'ticket/2.6.x/5605' of git://github.com/stschulte/puppet into 2.6.next"
  (#6723) Fix withenv environment restoration bug
  (#6689) Remove extraneous include of Puppet::Util in InventoryActiveRecord
  Remove extra trailing whitespace from lib/puppet/resource.rb
  (#5428) More fully "stub" Puppet::Resource::Reference for use with storedconfigs
  (#6707) Fix typo in rest_authconfig.rb
  (#6689) Make inventory_active_record terminus search quickly
  (#5479) Test that we auto-require the zone dataset.
  (#5479) Autorequire zfs filesystem when zone dataset is configured
  (#5392) Give a better error when realizing a non-existant resource
  (#2645) Adding a less-stubby test to verify the "system" attribute's behavior
  Update CHANGELOG for 2.6.6
  maint: Remove serialization of InventoryFact values
  maint: Rename InventoryHost to InventoryNode
  (#6441) Add mount fixture for AIX's /etc/filesystems
  Fixed #2645 - Added support for creating system users
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
index 451813f7d..577b62b62 100755
--- a/lib/puppet/node/facts.rb
+++ b/lib/puppet/node/facts.rb
@@ -61,7 +61,7 @@ class Puppet::Node::Facts
 
   def self.from_pson(data)
     result = new(data['name'], data['values'])
-    result.values[:_timestamp] = Time.parse(data['timestamp'])
+    result.timestamp = Time.parse(data['timestamp'])
     result.expiration = Time.parse(data['expiration'])
     result
   end
@@ -70,8 +70,8 @@ class Puppet::Node::Facts
     {
       'expiration' => expiration,
       'name' => name,
-      'timestamp' => values[:_timestamp],
-      'values' => values.reject {|k,v| k == :_timestamp},
+      'timestamp' => timestamp,
+      'values' => strip_internal,
     }.to_pson(*args)
   end