summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:56:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:56:04 +0000
commiteee441fdfe9941d13aff0333effd0c6f6ced346f (patch)
tree3a6db25e7e76358463f3762830d17f2ca1f1c6ea /ChangeLog
parentbe4b713d53381cbaec2a9b3aeef0113eeacc172b (diff)
merge revision(s) 55729: [Backport #12611]
* vm.c (vm_set_main_stack): remove unnecessary check. toplevel binding must be initialized. [Bug #12611] (N1) * win32/win32.c (w32_symlink): fix return type. [Bug #12611] (N3) * string.c (rb_str_split_m): simplify the condition. [Bug #12611](N4) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55925 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ad58d69bb8..27f3a40562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Aug 16 13:52:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (vm_set_main_stack): remove unnecessary check. toplevel
+ binding must be initialized. [Bug #12611] (N1)
+
+ * string.c (rb_str_split_m): simplify the condition.
+ [Bug #12611](N4)
+
Tue Aug 16 13:42:42 2016 Naohisa Goto <ngotogenome@gmail.com>
* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time