Merge branch '0.24.x'

Conflicts:
	bin/ralsh
	lib/puppet/executables/client/certhandler.rb
	lib/puppet/parser/functions/versioncmp.rb
	lib/puppet/parser/resource/reference.rb
	lib/puppet/provider/augeas/augeas.rb
	lib/puppet/provider/nameservice/directoryservice.rb
	lib/puppet/provider/ssh_authorized_key/parsed.rb
	lib/puppet/type.rb
	lib/puppet/type/file/checksum.rb
	spec/integration/defaults.rb
	spec/integration/transaction/report.rb
	spec/unit/executables/client/certhandler.rb
	spec/unit/indirector/ssl_rsa/file.rb
	spec/unit/node/catalog.rb
	spec/unit/provider/augeas/augeas.rb
	spec/unit/rails.rb
	spec/unit/type/ssh_authorized_key.rb
	spec/unit/type/tidy.rb
	test/executables/filebucket.rb
	test/executables/puppetbin.rb

1 files changed, 3 insertions, 3 deletions

diff --git a/tasks/rake/reductive.rb b/tasks/rake/reductive.rb
index fb0921768..4a3e18bc1 100644
--- a/tasks/rake/reductive.rb
+++ b/tasks/rake/reductive.rb
@@ -457,10 +457,10 @@ class Rake::RedLabProject < Rake::TaskLib
 
     desc "Run all unit tests."
     task :alltests do
-        if FileTest.exists?("test/Rakefile")
-            sh %{cd test; rake}
+        if FileTest.exists?("spec/Rakefile")
+            sh %{cd spec; rake}
         else
-            Dir.chdir("test") do
+            Dir.chdir("spec") do
                 Dir.entries(".").find_all { |f| f =~ /\.rb/ }.each do |f|
                     sh %{ruby #{f}}
                 end