Merge branch '2.7.x'

* 2.7.x: (40 commits)
  (#7746) Fix bootstrap issues from #7717 fix.
  (#7683) Use ronn, when available, to render the output.
  (#7683) Add a 'man' face and subcommand to Puppet.
  maint: remove obsolete work-around code from help face.
  (#7699) Don't duplicate inherited action names on faces.
  (#7177) Deprecate implicit 'puppet apply' for 2.7.0
  (#7717) Layout cleanup for subcommand extraction.
  #7211: Test unknown options don't shadow unknown actions.
  #7211: nasty logic error with global Face options taking arguments.
  #7211: more helpful error messages in various cases.
  maint: Fix order dependent test failure
  (#5966) Add support for hostname regular expressions in auth.conf
  (#7708) Delete extended documentation from configuration reference
  (#7707) Document signals in puppet agent and puppet master help
  add puppet master polling step for ticket 7117
  (#5318) Always notice changes to manifests when compiling.
  (#5318) Always notice changes to manifests when compiling.
  (#7557) Remove Faces Application
  maint: Fix order dependent spec failure for face indirection
  (#7690) Don't blow up when listing terminuses available for faces
  ...

Conflicts (resolved manually):
	acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/unit/util/autoload_spec.rb b/spec/unit/util/autoload_spec.rb
index 512f06c75..d61b7689e 100755
--- a/spec/unit/util/autoload_spec.rb
+++ b/spec/unit/util/autoload_spec.rb
@@ -51,9 +51,9 @@ describe Puppet::Util::Autoload do
       @autoload.search_directories.should == %w{/one /two /libdir1 /lib/dir/two /third/lib/dir} + $LOAD_PATH
     end
 
-    it "should include in its search path all of the search directories that have a subdirectory matching the autoload path" do
+    it "should include in its search path all of the unique search directories that have a subdirectory matching the autoload path" do
       @autoload = Puppet::Util::Autoload.new("foo", "loaddir")
-      @autoload.expects(:search_directories).returns %w{/one /two /three}
+      @autoload.expects(:search_directories).returns %w{/one /two /three /three}
       FileTest.expects(:directory?).with("/one/loaddir").returns true
       FileTest.expects(:directory?).with("/two/loaddir").returns false
       FileTest.expects(:directory?).with("/three/loaddir").returns true