summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-17 08:05:45 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-08-17 08:05:45 +0000
commitd3a6478dbb6bf9046917738b785f59c8b38a1641 (patch)
treedf071dfb436a391da226d3ed2bc65115633916b8 /ChangeLog
parentccef579aee4ab784e1a46ea755d2717224f628c2 (diff)
merge revision(s) 51531: [Backport #11368]
* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised in OpenSSL tests. [ruby-core:70020][Bug #11368] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@51604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c96ba9050d..ebde35ca4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 17 17:04:57 2015 Jeremy Evans <merch-redmine@jeremyevans.net>
+
+ * test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
+ in OpenSSL tests. [ruby-core:70020][Bug #11368]
+
Mon Aug 17 16:51:45 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/timeout.rb (ExitException): leave Timeout::ExitException as an