summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-17 09:09:32 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-17 09:09:32 +0000
commitefe5d8db6e7934e7a6e4cec3f8b134b622a63b0c (patch)
treeda5cc20bd505f5ebf945633951e2f63903f2d902 /ChangeLog
parent4c58aa8ec7d1ab0fb725f90498fdab35ac461483 (diff)
merge revision(s) 43148,43149,43152: [Backport #8433]
* thread.c (terminate_atfork_i): fix locking mutexes not unlocked in forks when not tracked in thread. [ruby-core:55102] [Bug #8433] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@45026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9cbe7eb5d2..1cc736a38d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 17 18:04:40 2014 Aaron Pfeifer <aaron.pfeifer@gmail.com>
+
+ * thread.c (terminate_atfork_i): fix locking mutexes not unlocked in
+ forks when not tracked in thread. [ruby-core:55102] [Bug #8433]
+
Fri Feb 14 21:01:12 2014 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket: revert r44943 because it causes errors on some linux