1 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index eb2bd0b5d2..185b75473c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Tue Dec 27 19:10:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (dump_funcall, dump_check_funcall, load_funcall):
+	  function calls with reentrant check.  always show names
+	  corresponding to the called methods.
+
+	* marshal.c (check_userdump_arg): marshal_dump should not return an
+	  instance of the same class, otherwise it causes infinite recursion.
+	  [Bug #12974]
+
 Tue Dec 27 18:34:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* compile.c (setup_args): duplicate splatting array if more