diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-11 22:53:02 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-11-11 22:53:02 +0000 |
commit | 777cead59a6b620ffd55f92067a30a41e6b90672 (patch) | |
tree | 6aa6671c34cb969f1b8e7c7193d8ebdf8354aa3a | |
parent | 4ff235fe433124eed0ee089b8a9d85f74891952f (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_2@56732 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | spec/default.mspec | 1 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/default.mspec b/spec/default.mspec index 47f5dd12e5..ac701a2bc9 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -17,5 +17,6 @@ class MSpecScript -I#{File.expand_path srcdir}/#{config['EXTOUT']}/common -I#{File.expand_path srcdir}/- #{File.expand_path srcdir}/tool/runruby.rb --archdir=#{Dir.pwd} --extout=#{config['EXTOUT']} + -- ] end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-11-12" -#define RUBY_PATCHLEVEL 390 +#define RUBY_PATCHLEVEL 391 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 11 |