summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-04 09:29:43 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-04 09:29:43 +0000
commit79086bb454f604cc993f57b270333d409eb8d900 (patch)
treedd0d445c0f68937cba92ce80f781332380d77668 /ChangeLog
parent5374e6b20e67ca21b60fcfcf521e981e7a03b64f (diff)
merge revision(s) 34897,34904,34906,34931:
Old linux (at least CentOS 5.6, kernel 2.6.18) wakes up 4.99 sec. * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): syntax error. * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): call uname only on linux because it's a workaround for linux only. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog7
1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a85063dfd..eaa1e5e548 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Apr 4 18:29:15 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): syntax error.
+
+ * test/ruby/test_sleep.rb (TestSleep#test_sleep_5sec): call uname
+ only on linux because it's a workaround for linux only.
+
Wed Apr 4 11:32:09 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/-test-/add_suffix/bug.c: make all functions in util.c static