summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 11:08:17 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-11-18 11:08:17 +0000
commit7e9ce9f5d68d0a6129147e7cd69490554c6e7ae3 (patch)
tree0fe814f468b4c4e53b021348e93cf86e6415451c /ChangeLog
parenta6b6f9bb5941bb616608729fa9678b08d23e4c56 (diff)
merge revision(s) 49099: [Backport #10046]
* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb): fix test failure with OpenSSL disabled SSLv3 protocol. [ruby-core:63772] [Bug #10046] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@52637 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 3e1d4e9c8c..b2cfa328d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Nov 18 20:04:50 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+
+ * test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
+ fix test failure with OpenSSL disabled SSLv3 protocol.
+ [ruby-core:63772] [Bug #10046]
+
Thu Oct 29 23:54:35 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear