diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 10:27:07 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-02-25 10:27:07 +0000 |
| commit | ca8b2d26f03b5bb5e71a0de6bab1580b6326fe14 (patch) | |
| tree | 247305d6c4da35c3efbc16120ffdcff258d39286 /ChangeLog | |
| parent | 63b34adea2eb7af969f7523d34a72427b8b8dbde (diff) | |
merge revision(s) 53609: [Backport #12011]
* marshal.c (r_object0): honor Marshal.load post proc
value for TYPE_LINK. by Hiroshi Nakamura <nahi@ruby-lang.org>
https://github.com/ruby/ruby/pull/1204 fix GH-1204
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Thu Feb 25 19:25:25 2016 NARUSE, Yui <naruse@ruby-lang.org> + + * marshal.c (r_object0): honor Marshal.load post proc + value for TYPE_LINK. by Hiroshi Nakamura <nahi@ruby-lang.org> + https://github.com/ruby/ruby/pull/1204 fix GH-1204 + Thu Feb 25 18:59:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/socket/option.c (sockopt_bool): relax boolean size to be one |