summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-30 12:19:43 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-30 12:19:43 +0000
commit6602bc193b378f832e52f446df8804efafd5dfb8 (patch)
tree344bb18580b46ce9fdf18ce203aca0a44c96e98f /ChangeLog
parent041afd1cfb337d1d056defa118281728185beb97 (diff)
merge revision(s) 52745: [Backport #11738]
* io.c (argf_getpartial): should not resize str if the second argument is not given. [ruby-core:71668] [Bug #11738] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52800 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 7a3fe40bdf..eb9e72240e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 30 21:18:24 2015 Shugo Maeda <shugo@ruby-lang.org>
+
+ * io.c (argf_getpartial): should not resize str if the second
+ argument is not given.
+ [ruby-core:71668] [Bug #11738]
+
Mon Nov 30 21:17:08 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/net/http.rb: set hostname before call ossl_ssl_set_session.