summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 16:04:52 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 16:04:52 +0000
commit1f32d9f495f7ace063cf57fcd28192f65afb5611 (patch)
tree21ea4578606e5267e47850898a54e16f10201f4d
parent4ed0c2c6ff3505cdc3c7e761c193547aee7e5a3e (diff)
merge revision(s) 56682: [Backport #12922]
default.mspec: end of options * spec/default.mspec (MSpecScript): add the end of options to runruby.rb, to fix failure at ruby/spec@a0e55db. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--spec/default.mspec1
-rw-r--r--version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/default.mspec b/spec/default.mspec
index 60ceaf3b3c..da21470053 100644
--- a/spec/default.mspec
+++ b/spec/default.mspec
@@ -19,5 +19,6 @@ class MSpecScript
-I#{File.expand_path srcdir}
-I#{File.expand_path srcdir}/#{config['EXTOUT']}/common
#{File.expand_path srcdir}/tool/runruby.rb --archdir=#{Dir.pwd} --extout=#{config['EXTOUT']}
+ --
]
end
diff --git a/version.h b/version.h
index 68e47da4e4..ab7b0add78 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.2"
#define RUBY_RELEASE_DATE "2016-11-12"
-#define RUBY_PATCHLEVEL 210
+#define RUBY_PATCHLEVEL 211
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 11