Merge branch '2.7.x'

Conflicts:
	lib/puppet/provider/augeas/augeas.rb
	spec/unit/node_spec.rb

1 files changed, 1 insertions, 4 deletions

diff --git a/spec/unit/node_spec.rb b/spec/unit/node_spec.rb
index 5f3e3b44d..a47c716f4 100755
--- a/spec/unit/node_spec.rb
+++ b/spec/unit/node_spec.rb
@@ -201,11 +201,8 @@ end
 describe Puppet::Node, "when indirecting" do
   it "should default to the 'plain' node terminus" do
     Puppet::Node.indirection.reset_terminus_class
-    Puppet::Node.indirection.terminus_class.should == :plain
-  end
 
-  it "should not have a cache class defined" do
-    Puppet::Node.indirection.cache_class.should be_nil
+    Puppet::Node.indirection.terminus_class.should == :plain
   end
 end