Merge remote branch 'mainstream/master'

Conflicts:
	railties/guides/source/3_0_release_notes.textile

1 files changed, 8 insertions, 3 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index c8f0f9946b..522d1209c9 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -7,7 +7,11 @@ def root_dir
 end
 
 def rake(*tasks)
-  tasks.each { |task| return false unless system("bundle exec rake", task) }
+  tasks.each do |task|
+    cmd = "bundle exec rake #{task}"
+    puts "Running command: #{cmd}"
+    return false unless system(cmd)
+  end
   true
 end
 
@@ -19,7 +23,7 @@ build_results = {}
 build_results[:geminstaller] = system "sudo gem install rubygems-update -v 1.3.5 --no-ri --no-rdoc"
 
 # Install required version of bundler.
-build_results[:geminstaller] = system "sudo gem install bundler -v 0.9.0.pre3 --prerelease --no-ri --no-rdoc"
+build_results[:geminstaller] = system "sudo gem install bundler -v 0.9.1.pre1 --prerelease --no-ri --no-rdoc"
 
 cd root_dir do
   puts
@@ -105,7 +109,8 @@ puts "[CruiseControl]   #{`mysql --version`}"
 puts "[CruiseControl]   #{`pg_config --version`}"
 puts "[CruiseControl]   SQLite3: #{`sqlite3 -version`}"
 `gem env`.each_line {|line| print "[CruiseControl]   #{line}"}
-puts "[CruiseControl]   Bundled gems:"
+# Commented until bundler supports --list again
+# puts "[CruiseControl]   Bundled gems:"
 # `gem bundle --list`.each_line {|line| print "[CruiseControl]     #{line}"}
 puts "[CruiseControl]   Local gems:"
 `gem list`.each_line {|line| print "[CruiseControl]     #{line}"}