usa	2016-11-12 07:53:02 +0900 (Sat, 12 Nov 2016)

  New Revision: 56732

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=56732

  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_2/
  Modified files:
    branches/ruby_2_2/spec/default.mspec
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 56731)
+++ ruby_2_2/version.h	(revision 56732)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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
Index: ruby_2_2/spec/default.mspec
===================================================================
--- ruby_2_2/spec/default.mspec	(revision 56731)
+++ ruby_2_2/spec/default.mspec	(revision 56732)
@@ -17,5 +17,6 @@ class MSpecScript https://github.com/ruby/ruby/blob/trunk/ruby_2_2/spec/default.mspec#L17
     -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

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r56682


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/