Merge branch 'master' into nested_has_many_through

Conflicts:
	activerecord/CHANGELOG
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/test/schema/schema.rb

1 files changed, 11 insertions, 11 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index 6bc0c69112..fd884b3b2e 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -25,14 +25,14 @@ build_results[:install_bundler] = system bundler_install_cmd
 
 cd root_dir do
   puts
-  puts "[CruiseControl] Bundling RubyGems"
+  puts "[CruiseControl] Bundling gems"
   puts
   build_results[:bundle] = system 'bundle update'
 end
 
 cd "#{root_dir}/activesupport" do
   puts
-  puts "[CruiseControl] Building ActiveSupport"
+  puts "[CruiseControl] Building Active Support"
   puts
   build_results[:activesupport] = rake 'test'
   # build_results[:activesupport_isolated] = rake 'test:isolated'
@@ -41,14 +41,14 @@ end
 system "sudo rm -R #{root_dir}/railties/tmp"
 cd "#{root_dir}/railties" do
   puts
-  puts "[CruiseControl] Building RailTies"
+  puts "[CruiseControl] Building Railties"
   puts
   build_results[:railties] = rake 'test'
 end
 
 cd "#{root_dir}/actionpack" do
   puts
-  puts "[CruiseControl] Building ActionPack"
+  puts "[CruiseControl] Building Action Pack"
   puts
   build_results[:actionpack] = rake 'test'
   # build_results[:actionpack_isolated] = rake 'test:isolated'
@@ -56,7 +56,7 @@ end
 
 cd "#{root_dir}/actionmailer" do
   puts
-  puts "[CruiseControl] Building ActionMailer"
+  puts "[CruiseControl] Building Action Mailer"
   puts
   build_results[:actionmailer] = rake 'test'
   # build_results[:actionmailer_isolated] = rake 'test:isolated'
@@ -64,7 +64,7 @@ end
 
 cd "#{root_dir}/activemodel" do
   puts
-  puts "[CruiseControl] Building ActiveModel"
+  puts "[CruiseControl] Building Active Model"
   puts
   build_results[:activemodel] = rake 'test'
   # build_results[:activemodel_isolated] = rake 'test:isolated'
@@ -73,7 +73,7 @@ end
 rm_f "#{root_dir}/activeresource/debug.log"
 cd "#{root_dir}/activeresource" do
   puts
-  puts "[CruiseControl] Building ActiveResource"
+  puts "[CruiseControl] Building Active Resource"
   puts
   build_results[:activeresource] = rake 'test'
   # build_results[:activeresource_isolated] = rake 'test:isolated'
@@ -82,7 +82,7 @@ end
 rm_f "#{root_dir}/activerecord/debug.log"
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with MySQL"
+  puts "[CruiseControl] Building Active Record with MySQL"
   puts
   build_results[:activerecord_mysql] = rake 'mysql:rebuild_databases', 'mysql:test'
   # build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
@@ -90,7 +90,7 @@ end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with MySQL2"
+  puts "[CruiseControl] Building Active Record with MySQL2"
   puts
   build_results[:activerecord_mysql2] = rake 'mysql:rebuild_databases', 'mysql2:test'
   # build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
@@ -98,7 +98,7 @@ end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with PostgreSQL"
+  puts "[CruiseControl] Building Active Record with PostgreSQL"
   puts
   build_results[:activerecord_postgresql8] = rake 'postgresql:rebuild_databases', 'postgresql:test'
   # build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
@@ -106,7 +106,7 @@ end
 
 cd "#{root_dir}/activerecord" do
   puts
-  puts "[CruiseControl] Building ActiveRecord with SQLite 3"
+  puts "[CruiseControl] Building Active Record with SQLite 3"
   puts
   build_results[:activerecord_sqlite3] = rake 'sqlite3:test'
   # build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'