1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d1ee35313f..c706c6100f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul 13 19:11:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (timeout): warn as deprecated for a long time.
+
 Mon Jul 13 01:37:27 2015  Zachary Scott  <zzak@ruby-lang.org>
 
         * ext/openssl/ossl.c: [DOC] Backport ruby/openssl@dbb3fdb [Bug #11345]