aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-07-07 07:40:26 +0930
committerGitHub <noreply@github.com>2016-07-07 07:40:26 +0930
commitaeba05d389a846908cedbafa3a82eb781ae0f19d (patch)
tree51538a6aabc93247cef3da4bb0d70a47014ae5ec /activerecord/CHANGELOG.md
parentd5ca0a8b8e4a9ab301ba37a335e62ada872e7a76 (diff)
parent61f4b1ff8a54ccd7e70bb4f6c0b958b28bc648fc (diff)
downloadrails-aeba05d389a846908cedbafa3a82eb781ae0f19d.tar.gz
rails-aeba05d389a846908cedbafa3a82eb781ae0f19d.tar.bz2
rails-aeba05d389a846908cedbafa3a82eb781ae0f19d.zip
Merge pull request #25707 from matthewd/double-reap
Don't reap connections that have already been reassigned
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 8521d3b07b..4637847987 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,10 @@
+* Ensure concurrent invocations of the connection reaper cannot allocate the
+ same connection to two threads.
+
+ Fixes #25585.
+
+ *Matthew Draper*
+
* Inspecting an object with an associated array of over 10 elements no longer
truncates the array, preventing `inspect` from looping infinitely in some
cases.