From 9fb18fc4d6d57b2fe8c3858b4a4ef63e05784735 Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Mon, 28 Aug 2017 11:40:29 +0530
Subject: Added CHANGELOG for #30360 [ci skip]
---
activerecord/CHANGELOG.md | 5 +++++
1 file changed, 5 insertions(+)
(limited to 'activerecord')
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*
--
cgit v1.2.3