diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2017-08-29 15:58:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-29 15:58:44 +0900 |
| commit | ca941da4002bb604bc7fef7bedcff8428bd5dc08 (patch) | |
| tree | 1a9b8a6caa0c7da10584043965c52fda4511b751 /activerecord | |
| parent | edd57357b7ef33c574a5773483658120771da8fd (diff) | |
| parent | 9fb18fc4d6d57b2fe8c3858b4a4ef63e05784735 (diff) | |
| download | rails-ca941da4002bb604bc7fef7bedcff8428bd5dc08.tar.gz rails-ca941da4002bb604bc7fef7bedcff8428bd5dc08.tar.bz2 rails-ca941da4002bb604bc7fef7bedcff8428bd5dc08.zip | |
Merge pull request #30439 from prathamesh-sonpatki/changelog-30360
Added CHANGELOG for #30360 [ci skip]
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 1a1a3a8092..b421fedc96 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,3 +1,8 @@ +* Add new error class `TransactionTimeout` for MySQL adapter which will be raised + when lock wait time expires. + + *Gabriel Courtemanche* + * Remove deprecated `#migration_keys`. *Ryuta Kamizono* |