From b1a18cf49bc475e6c563f55b23fa36594d70f4bc Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 Nov 2012 02:00:19 +0000
Subject: * thread.c (thread_join): raises ThreadError if target therad   is a
 main thread. * test/ruby/test_thread.rb (test_thread_join_main_thread):  
 test for the above. * NEWS: news for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37884 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'NEWS')

diff --git a/NEWS b/NEWS
index 7417fb0824..269fcbe2b6 100644
--- a/NEWS
+++ b/NEWS
@@ -160,7 +160,7 @@ with all sufficient information, see the ChangeLog file.
     * incompatible changes:
       * Thread#join no longer allows to be used from trap handler. Now it raises
         ThreadError.
-      * Thread#join raises ThreadError if target therad is a current thread.
+      * Thread#join raises ThreadError if target therad is a current or main thread. 
 
   * Time
     * change return value:
-- 
cgit v1.2.3