aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2012-01-20 18:17:36 +0000
committerJon Leighton <j@jonathanleighton.com>2012-01-20 18:31:41 +0000
commitfab664a8e9c94d7e3c52fed70ea2c0f569d142fb (patch)
tree9f87d7210c4054531138dd270ab4328680a80b3c /activerecord/CHANGELOG.md
parentf36dcaf488b4357a52f43e3912628428956d351f (diff)
downloadrails-fab664a8e9c94d7e3c52fed70ea2c0f569d142fb.tar.gz
rails-fab664a8e9c94d7e3c52fed70ea2c0f569d142fb.tar.bz2
rails-fab664a8e9c94d7e3c52fed70ea2c0f569d142fb.zip
Fix another race condition.
From 2c667f69aa2daac5ee6c29ca9679616e2a71532a. Thanks @pwnall for the heads-up. Conflicts: activerecord/lib/active_record/core.rb
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 4bf7684874..05c32ecf86 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 3.2.1 (unreleased) ##
+
+* 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