1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 28f55f2ec2..39d4f2d22e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Apr 16 00:56:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_setname): defer setting native thread name
+	  set in initialize until the native thread is created.
+	  [ruby-core:74963] [Bug #12290]
+
 Fri Apr 15 21:10:00 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.