summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-20 14:52:28 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-20 14:52:28 +0000
commit7029875b20fa7f231b8145442b46a1f31cd89809 (patch)
treef3ea0eb7843bd3bde8032e9ac8ddb2d3b132b49c /ChangeLog
parent3207cfced7dc17d3971e76bb080aadae02b5eb2d (diff)
merge revision(s) 40232: [Backport #8251]
* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill if it fails with Errno::EPERM on Windows (workaround). [ruby-dev:47245] [Bug #8251] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 11ddb26523..111721eb26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 20 23:49:33 2013 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
+ if it fails with Errno::EPERM on Windows (workaround).
+ [ruby-dev:47245] [Bug #8251]
+
Sat Jul 20 23:31:11 2013 Aman Gupta <tmm1@ruby-lang.org>
* iseq.c (iseq_location_setup): re-use existing string when iseq has