summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-09 06:30:21 +0000
committerkosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-09 06:30:21 +0000
commitc2cb8ea3174b60b3b87cd2fa916cf10e6776864b (patch)
tree89b2db52acd9aec8111fe9df7276fddbdfada0d6 /ChangeLog
parent09729a5693a782bcb7602d93d94bf2268d4f114c (diff)
merge revision(s) 36926:
* thread.c (rb_mutex_lock): stop multiple threads use pthread_cond_timedwait() concurrently. [Bug #6278] [ruby-core:44275] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36928 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 ab704cdf6c..16b12421d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 9 02:30:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread.c (rb_mutex_lock): stop multiple threads use
+ pthread_cond_timedwait() concurrently. [Bug #6278] [ruby-core:44275]
+
Thu Aug 30 09:24:43 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/ftp.rb (URI::FTP#initialize): raise InvalidURIError if "//"