From f0739b6f1e30a8328696767c8b99dad9fd249346 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 28 Oct 2009 14:15:54 +0000
Subject: merges r24616 from trunk into ruby_1_9_1. -- * thread.c
 (rb_check_deadlock): decrease number of sleepers before   deadlock detection
 because the deadlock exception makes main thread   run.  [ruby-dev:39142]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25541 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 02a3603e6..66389f05c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Aug 22 00:03:19 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (rb_check_deadlock): decrease number of sleepers before
+	  deadlock detection because the deadlock exception makes main thread
+	  run.  [ruby-dev:39142]
+
 Fri Aug 21 15:01:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/readline/readline.c (readline_readline): use rb_prep_terminal
-- 
cgit