Merge remote branch 'rails/master' into identity_map

Conflicts:
	activerecord/examples/performance.rb
	activerecord/lib/active_record/association_preload.rb
	activerecord/lib/active_record/associations.rb
	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/autosave_association.rb
	activerecord/lib/active_record/base.rb
	activerecord/lib/active_record/nested_attributes.rb
	activerecord/test/cases/relations_test.rb

1 files changed, 9 insertions, 9 deletions

diff --git a/ci/ci_build.rb b/ci/ci_build.rb
index fd884b3b2e..964e2d4eb8 100755
--- a/ci/ci_build.rb
+++ b/ci/ci_build.rb
@@ -35,7 +35,7 @@ cd "#{root_dir}/activesupport" do
   puts "[CruiseControl] Building Active Support"
   puts
   build_results[:activesupport] = rake 'test'
-  # build_results[:activesupport_isolated] = rake 'test:isolated'
+  build_results[:activesupport_isolated] = rake 'test:isolated'
 end
 
 system "sudo rm -R #{root_dir}/railties/tmp"
@@ -51,7 +51,7 @@ cd "#{root_dir}/actionpack" do
   puts "[CruiseControl] Building Action Pack"
   puts
   build_results[:actionpack] = rake 'test'
-  # build_results[:actionpack_isolated] = rake 'test:isolated'
+  build_results[:actionpack_isolated] = rake 'test:isolated'
 end
 
 cd "#{root_dir}/actionmailer" do
@@ -59,7 +59,7 @@ cd "#{root_dir}/actionmailer" do
   puts "[CruiseControl] Building Action Mailer"
   puts
   build_results[:actionmailer] = rake 'test'
-  # build_results[:actionmailer_isolated] = rake 'test:isolated'
+  build_results[:actionmailer_isolated] = rake 'test:isolated'
 end
 
 cd "#{root_dir}/activemodel" do
@@ -67,7 +67,7 @@ cd "#{root_dir}/activemodel" do
   puts "[CruiseControl] Building Active Model"
   puts
   build_results[:activemodel] = rake 'test'
-  # build_results[:activemodel_isolated] = rake 'test:isolated'
+  build_results[:activemodel_isolated] = rake 'test:isolated'
 end
 
 rm_f "#{root_dir}/activeresource/debug.log"
@@ -76,7 +76,7 @@ cd "#{root_dir}/activeresource" do
   puts "[CruiseControl] Building Active Resource"
   puts
   build_results[:activeresource] = rake 'test'
-  # build_results[:activeresource_isolated] = rake 'test:isolated'
+  build_results[:activeresource_isolated] = rake 'test:isolated'
 end
 
 rm_f "#{root_dir}/activerecord/debug.log"
@@ -85,7 +85,7 @@ cd "#{root_dir}/activerecord" do
   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'
+  build_results[:activerecord_mysql_isolated] = rake 'mysql:rebuild_databases', 'mysql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -93,7 +93,7 @@ cd "#{root_dir}/activerecord" do
   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'
+  build_results[:activerecord_mysql2_isolated] = rake 'mysql:rebuild_databases', 'mysql2:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -101,7 +101,7 @@ cd "#{root_dir}/activerecord" do
   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'
+  build_results[:activerecord_postgresql8_isolated] = rake 'postgresql:rebuild_databases', 'postgresql:isolated_test'
 end
 
 cd "#{root_dir}/activerecord" do
@@ -109,7 +109,7 @@ cd "#{root_dir}/activerecord" do
   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'
+  build_results[:activerecord_sqlite3_isolated] = rake 'sqlite3:isolated_test'
 end