From e41ee7cf3347ced6e689c198dbf3c5900009d70f Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Feb 2016 10:58:02 +0000
Subject: merge revision(s) 53677: [Backport #11877]

        * ext/socket/socket.c (sock_gethostname): support unlimited size
          hostname.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@53936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index f407b73801..2216dd43ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 25 19:49:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_gethostname): support unlimited size
+	  hostname.
+
 Thu Feb 25 19:28:19 2016  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/xmlrpc/client.rb: Support SSL options in async methods of
-- 
cgit v1.2.3