diff options
author | Jonathan Rochkind <jonathan@dnil.net> | 2012-09-21 12:35:11 -0400 |
---|---|---|
committer | Jonathan Rochkind <jonathan@dnil.net> | 2012-09-24 16:20:22 -0400 |
commit | 39087068c2e3c85f6839ea51eab4480673138a2b (patch) | |
tree | f9b8a6120ff14d04115e6d31fa17d69035d9a9f1 /railties/lib/rails | |
parent | 7b545ff911a3f9bd3c9b179a2c6ac6b70bab3ee0 (diff) | |
download | rails-39087068c2e3c85f6839ea51eab4480673138a2b.tar.gz rails-39087068c2e3c85f6839ea51eab4480673138a2b.tar.bz2 rails-39087068c2e3c85f6839ea51eab4480673138a2b.zip |
ConnectionPool accepts spec key 'checkout_timeout'
Backport of #6441 cb6f83935 . Old 'wait_timeout' is still supported,
but conflicts with mysql2 using that spec key for different thing.
'checkout_timeout' can now be used taking precedence for ConnectionPool
over 'wait_timeout'.
Diffstat (limited to 'railties/lib/rails')
0 files changed, 0 insertions, 0 deletions