summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/ruby/test_gc.rb2
-rw-r--r--version.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb
index c644aa5d9a..402d560bff 100644
--- a/test/ruby/test_gc.rb
+++ b/test/ruby/test_gc.rb
@@ -244,7 +244,7 @@ class TestGc < Test::Unit::TestCase
GC::Profiler.clear
GC.start
- assert_operator(GC::Profiler.total_time, :>, 0)
+ assert_operator(GC::Profiler.total_time, :>=, 0)
ensure
GC::Profiler.disable
end
diff --git a/version.h b/version.h
index a5e4c2bff7..3e43f5d209 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-05-06"
-#define RUBY_PATCHLEVEL 93
+#define RUBY_RELEASE_DATE "2014-05-08"
+#define RUBY_PATCHLEVEL 94
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 8
#include "ruby/version.h"