summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-30 14:29:32 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-11-30 14:29:32 +0000
commit9ad02399920e67053063b122f10e9973c50d6ed8 (patch)
tree2b44b40fa1cb1bcbd8f1f76172bdd8f919d378bc /ChangeLog
parent463a56d14b9241c8631d71d286760ea092d70c36 (diff)
merge revision(s) 60149: [Backport #14003]
Merge rubygems-2.6.14 changes. It fixed http://blog.rubygems.org/2017/10/09/unsafe-object-deserialization-vulnerability.html git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@60946 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 2d1f21f197..b5822344fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 30 23:29:00 2017 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ Merge rubygems-2.6.14 changes.
+
+ It fixed http://blog.rubygems.org/2017/10/09/unsafe-object-deserialization-vulnerability.html
+
Fri Sep 15 05:40:40 2017 URABE Shyouhei <shyouhei@ruby-lang.org>
fix --with-gmp (broken by r57490)