summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/rinda/test_rinda.rb2
-rw-r--r--version.h6
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"