Merge branch '0.25.x'

Conflicts:
	lib/puppet/agent.rb
	lib/puppet/application/puppetd.rb
	lib/puppet/parser/ast/leaf.rb
	lib/puppet/util/rdoc/parser.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index 67d5ef4da..9c7e61927 100644
--- a/Rakefile
+++ b/Rakefile
@@ -41,13 +41,14 @@ task :spec do
     require 'spec'
     require 'spec/rake/spectask'
     begin
-        require 'rcov'
+#        require 'rcov'
     rescue LoadError
     end
 
     Spec::Rake::SpecTask.new do |t|
         t.spec_opts = ['--format','s', '--loadby','mtime']
         t.spec_files = FileList['spec/**/*.rb']
+        t.fail_on_error = false
         if defined?(Rcov)
             t.rcov = true
             t.rcov_opts = ['--exclude', 'spec/*,test/*,results/*,/usr/lib/*,/usr/local/lib/*']