summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-18 16:47:24 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-11-18 16:47:24 +0000
commit15aa5cd800728546719ef9466297d66835b753fd (patch)
tree0a6c09a9a5f9d59bfb29e95d03e550f7c82060ac /ChangeLog
parentef7daae2f4facef89c4a0aec1a739c1ed293d99b (diff)
downloadruby-15aa5cd800728546719ef9466297d66835b753fd.tar.gz
ruby-15aa5cd800728546719ef9466297d66835b753fd.tar.xz
ruby-15aa5cd800728546719ef9466297d66835b753fd.zip
merges r20229 and r20230 from trunk into ruby_1_9_1.
* thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that circular requires fail with deadlock. [ruby-core:19821] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog9
1 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index be0b1c21f..81ab3f267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Nov 13 11:31:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_barrier_wait): gets rid of recursive deadlock.
+
+Thu Nov 13 06:08:44 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_barrier_{new,wait,release,destroy}): use Mutex so that
+ circular requires fail with deadlock. [ruby-core:19821]
+
Wed Nov 12 07:16:01 2008 David Flanagan <david@think32>
* ruby.c (set_internal_encoding_once): fix typo in error string