aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-01-26 13:12:04 +0100
committerXavier Noria <fxn@hashref.com>2012-01-26 13:12:04 +0100
commit9725c0cb341584ee329695f18ef12fcbd831451e (patch)
tree1a259ef1804d989dcadcde9d51ea6c8b78dbeddb
parent8fab39527ff09819b517e96b96c7efb1d0180c06 (diff)
downloadrails-9725c0cb341584ee329695f18ef12fcbd831451e.tar.gz
rails-9725c0cb341584ee329695f18ef12fcbd831451e.tar.bz2
rails-9725c0cb341584ee329695f18ef12fcbd831451e.zip
syncs 3-2-stable CHANGELOGs in master
-rw-r--r--activerecord/CHANGELOG.md9
1 files changed, 9 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index e640700a24..11d20814af 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -73,6 +73,15 @@
* PostgreSQL hstore types are automatically deserialized from the database.
+
+## Rails 3.2.1 (unreleased) ##
+
+* The threshold for auto EXPLAIN is ignored if there's no logger. *fxn*
+
+* Fix possible race condition when two threads try to define attribute
+ methods for the same class.
+
+
## Rails 3.2.0 (January 20, 2012) ##
* Added a `with_lock` method to ActiveRecord objects, which starts