1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e0aa7502f..67e31ac1e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 28 13:51:12 2012  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Retry HTTP requests for additional network errors.
+	  Introduce OpenTimeout subclass of Timeout::Error.  [Bug #6001]
+	* test/net/http/test_http.rb:  Reduce timeout to 0.01s for faster test
+	* test/net/http/test_https.rb:  ditto
+
 Tue Feb 28 11:44:49 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (debugflags): check if -ggdb is accepted.