diff --git a/ChangeLog b/ChangeLog index 6a70f78c8a..ad5015dd31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Nov 28 23:37:14 2012 Masaya Tarui + + * NEWS (Thread) remove incompatible changes. + Wed Nov 28 22:57:23 2012 Koichi Sasada * thread_win32.c: catch up latest change of BLOCKING_REGION. diff --git a/NEWS b/NEWS index f0c38d48eb..bca93c1b22 100644 --- a/NEWS +++ b/NEWS @@ -163,11 +163,6 @@ 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 is no longer allowed to be used from trap - handler and raises a ThreadError in such case. - * Thread#join and Thread#value now raises a ThreadError if target thread - is the current or main thread. * Time * change return value: @@ -376,10 +371,6 @@ 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.