ruby-changes:44648
From: nagachika <ko1@a...>
Date: Sat, 12 Nov 2016 01:04:55 +0900 (JST)
Subject: [ruby-changes:44648] nagachika:r56721 (ruby_2_3): merge revision(s) 56682: [Backport #12922]
nagachika 2016-11-12 01:04:52 +0900 (Sat, 12 Nov 2016) New Revision: 56721 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56721 Log: 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. Modified directories: branches/ruby_2_3/ Modified files: branches/ruby_2_3/spec/default.mspec branches/ruby_2_3/version.h Index: ruby_2_3/spec/default.mspec =================================================================== --- ruby_2_3/spec/default.mspec (revision 56720) +++ ruby_2_3/spec/default.mspec (revision 56721) @@ -19,5 +19,6 @@ class MSpecScript https://github.com/ruby/ruby/blob/trunk/ruby_2_3/spec/default.mspec#L19 -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 Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 56720) +++ ruby_2_3/version.h (revision 56721) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #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 Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r56682 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/