Merge branch '2.7.x' into 2.7.next

Conflicts:
 * spec/unit/node/facts_spec.rb

Updates:
 * spec/unit/interface/action{,_builder}_spec.rb
   => update for 'when_invoked' block being required.

1 files changed, 0 insertions, 23 deletions

diff --git a/lib/puppet/node.rb b/lib/puppet/node.rb
index 4bd4d1de6..5b0a98615 100644
--- a/lib/puppet/node.rb
+++ b/lib/puppet/node.rb
@@ -20,29 +20,6 @@ class Puppet::Node
   attr_accessor :name, :classes, :source, :ipaddress, :parameters
   attr_reader :time
 
-  def self.from_pson(pson)
-    raise ArgumentError, "No name provided in pson data" unless name = pson['name']
-
-    node = new(name)
-    node.classes = pson['classes']
-    node.parameters = pson['parameters']
-    node.environment = pson['environment']
-    node
-  end
-
-  def to_pson(*args)
-    result = {
-      'document_type' => "Puppet::Node",
-      'data' => {}
-    }
-    result['data']['name'] = name
-    result['data']['classes'] = classes unless classes.empty?
-    result['data']['parameters'] = parameters unless parameters.empty?
-    result['data']['environment'] = environment.name
-
-    result.to_pson(*args)
-  end
-
   def environment
     return super if @environment