nagachika	2015-03-09 22:39:18 +0900 (Mon, 09 Mar 2015)

  New Revision: 49909

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

  Log:
    merge revision(s) r49752,r49753: [Backport #10953]
    
    * spec/default.mspec: remove specific version number.
      https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
    
    * spec/default.mspec: use default configuration file name.
      https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/spec/default.mspec
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49908)
+++ ruby_2_1/ChangeLog	(revision 49909)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Mon Mar  9 22:30:50 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* spec/default.mspec: use default configuration file name.
+	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
+
+Mon Mar  9 22:30:50 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* spec/default.mspec: remove specific version number.
+	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
+
 Mon Mar  9 22:27:47 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* common.mk: use ruby organization for rubyspec.
Index: ruby_2_1/spec/default.mspec
===================================================================
--- ruby_2_1/spec/default.mspec	(revision 49908)
+++ ruby_2_1/spec/default.mspec	(revision 49909)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/spec/default.mspec#L1
-load File.dirname(__FILE__) + '/rubyspec/ruby.1.9.mspec'
+load File.dirname(__FILE__) + '/rubyspec/default.mspec'
 class MSpecScript
   builddir = Dir.pwd
   srcdir = ENV['SRCDIR']
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49908)
+++ ruby_2_1/version.h	(revision 49909)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-09"
-#define RUBY_PATCHLEVEL 308
+#define RUBY_PATCHLEVEL 309
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49752-49753


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