summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-18 17:05:02 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-06-18 17:05:02 +0000
commit28e43a93eec254975b97b4257465cf96a8b85d05 (patch)
tree6534ceb9b96523b44f3f33f75007a7b912478c0e
parente46c1bc75ebab4022a6c99af47658414a565350c (diff)
merge revision(s) 41370:
Message is 3rd argument, not 2nd git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/ruby/test_lazy_enumerator.rb4
-rw-r--r--version.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb
index 75f26f29b7..22c39954ce 100644
--- a/test/ruby/test_lazy_enumerator.rb
+++ b/test/ruby/test_lazy_enumerator.rb
@@ -438,8 +438,8 @@ EOS
def test_map_zip
bug7507 = '[ruby-core:50545]'
- assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip(){}"], bug7507)
- assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip().to_a"], bug7507)
+ assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip(){}"], "", bug7507)
+ assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip().to_a"], "", bug7507)
end
def test_require_block
diff --git a/version.h b/version.h
index 9f2587deb9..46c13a8998 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-18"
-#define RUBY_PATCHLEVEL 228
+#define RUBY_RELEASE_DATE "2013-06-19"
+#define RUBY_PATCHLEVEL 229
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
#include "ruby/version.h"