From 85f444d407a3f4d004b949e9846cae3faaa2cd77 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 26 Apr 2012 23:30:04 +0000
Subject: merge revision(s) 35417:

	* test/rinda/test_rinda.rb: fix sticks on some testsf problem
	  [Bug #6272]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                | 5 +++++
 test/rinda/test_rinda.rb | 2 +-
 version.h                | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85e2dce82c..12becf030e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 27 08:29:51 2012  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/rinda/test_rinda.rb: fix sticks on some testsf problem 
+	  [Bug #6272]
+
 Wed Apr 25 05:56:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/optparse.rb (OptionParser#to_a): split for each lines.
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 8154b46da3..87f45c9082 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -94,7 +94,7 @@ end
 
 class TupleSpace
   def sleep(n)
-    Time.sleep(n)
+    Kernel.sleep(n * 0.01)
   end
 end
 
diff --git a/version.h b/version.h
index 4de8cb09d6..881f5afe64 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 200
+#define RUBY_PATCHLEVEL 201
 
-#define RUBY_RELEASE_DATE "2012-04-25"
+#define RUBY_RELEASE_DATE "2012-04-27"
 #define RUBY_RELEASE_YEAR 2012
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3