diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-03-16 18:54:51 +0000 |
| commit | 8aaf3c1e553d18b40d9980951d496bffad56f37b (patch) | |
| tree | 2eddd2b50a5924420b30caa5c6d867f4870a71dc /activerecord/lib/active_record/locking/optimistic.rb | |
| parent | 9abc94c44516afdcfe4a3b202c336c9578fd6d0d (diff) | |
| parent | 0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (diff) | |
| download | rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.gz rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.bz2 rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.zip | |
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activerecord/lib/active_record/locking/optimistic.rb')
| -rw-r--r-- | activerecord/lib/active_record/locking/optimistic.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/locking/optimistic.rb b/activerecord/lib/active_record/locking/optimistic.rb index 6b2b1ebafe..9a31675782 100644 --- a/activerecord/lib/active_record/locking/optimistic.rb +++ b/activerecord/lib/active_record/locking/optimistic.rb @@ -23,7 +23,7 @@ module ActiveRecord # p2.first_name = "should fail" # p2.save # Raises a ActiveRecord::StaleObjectError # - # Optimistic locking will also check for stale data when objects are destroyed. Example: + # Optimistic locking will also check for stale data when objects are destroyed. Example: # # p1 = Person.find(1) # p2 = Person.find(1) |