diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-20 01:58:27 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-20 01:58:27 +0000 |
| commit | e4254939aa8abb7a18f65e95cafaa2f37cbfa754 (patch) | |
| tree | 28975f8187a8d54782995d8903f7338950ce03bd /activerecord/lib/active_record.rb | |
| parent | 15aa6e05528019fbf62e1a5cbd2398a2205af8bb (diff) | |
| download | rails-e4254939aa8abb7a18f65e95cafaa2f37cbfa754.tar.gz rails-e4254939aa8abb7a18f65e95cafaa2f37cbfa754.tar.bz2 rails-e4254939aa8abb7a18f65e95cafaa2f37cbfa754.zip | |
r4663@asus: jeremy | 2006-06-19 17:23:57 -0700
ActiveRecord::Locking is now ActiveRecord::Locking::Optimistic (to make way for Pessimistic.)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4461 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record.rb')
| -rwxr-xr-x | activerecord/lib/active_record.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index fc70b0de68..ddd1f9ff4c 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -54,7 +54,7 @@ require 'active_record/xml_serialization' ActiveRecord::Base.class_eval do include ActiveRecord::Validations - include ActiveRecord::Locking + include ActiveRecord::Locking::Optimistic include ActiveRecord::Callbacks include ActiveRecord::Observing include ActiveRecord::Timestamp |