summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-28 14:53:47 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-28 14:53:47 +0000
commit5c32aff16eb82679dc31849b733936b3e276d296 (patch)
tree0e8a0d75a22b04323939e0f993296ee85f0aea26
parent36b21ada61220c0675fa3c00aa091538a2063739 (diff)
revert some part of r37942. sorry.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37945 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--NEWS7
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c1e9eab895..5f89193b8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 28 23:52:02 2012 Masaya Tarui <tarui@ruby-lang.org>
+
+ * NEWS (Thread) remove incompatible changes about trap.
+
Wed Nov 28 23:39:01 2012 Koichi Sasada <ko1@atdot.net>
* thread.c (rb_mutex_sleep): fix to allow spurious wakeup.
@@ -5,10 +9,6 @@ Wed Nov 28 23:39:01 2012 Koichi Sasada <ko1@atdot.net>
* NEWS: write about spurious wakeup.
-Wed Nov 28 23:37:14 2012 Masaya Tarui <tarui@ruby-lang.org>
-
- * NEWS (Thread) remove incompatible changes.
-
Wed Nov 28 22:57:23 2012 Koichi Sasada <ko1@atdot.net>
* thread_win32.c: catch up latest change of BLOCKING_REGION.
diff --git a/NEWS b/NEWS
index 62ad75aae4..5af940f91b 100644
--- a/NEWS
+++ b/NEWS
@@ -164,6 +164,9 @@ with all sufficient information, see the ChangeLog file.
variable has been set.
* added Thread#backtrace_locations which returns similar information of
Kernel#caller_locations.
+ * incompatible changes:
+ * Thread#join and Thread#value now raises a ThreadError if target thread
+ is the current or main thread.
* Time
* change return value:
@@ -372,6 +375,10 @@ with all sufficient information, see the ChangeLog file.
* OpenStruct new methods can conflict with custom attributes named
"each_pair", "eql?", "hash" or "to_h".
+ * Thread#join, Thread#value
+
+ See above.
+
* Mutex#lock, Mutex#unlock, Mutex#try_lock, Mutex#synchronize and Mutex#sleep
See above.