summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-11 17:18:12 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-11 17:18:12 +0000
commit7ebca22266ccd459e3848046293ee7b04fc0675b (patch)
treecce0946c467fb7ff398e55bb608f3314bc706bf3 /ChangeLog
parent70e6382b73506d24557e4a1add02917516710a20 (diff)
merge revision(s) 50685: [Backport #11198]
* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile [ruby-core:69419] [Feature #11198] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50838 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 4f175c30c1..ae878d36e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jun 12 01:39:49 2015 Eric Wong <e@80x24.org>
+
+ * ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
+ [ruby-core:69419] [Feature #11198]
+
Fri Jun 12 01:16:13 2015 Eric Wong <e@80x24.org>
* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,