naruse	2015-03-22 12:39:38 +0900 (Sun, 22 Mar 2015)

  New Revision: 50053

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

  Log:
    merge revision(s) 49689,49752,49753: [Backport #10953]
    
    * common.mk: use ruby organization for rubyspec.
    
    * 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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/common.mk
    branches/ruby_2_2/spec/default.mspec
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50052)
+++ ruby_2_2/ChangeLog	(revision 50053)
@@ -1,3 +1,17 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* spec/default.mspec: use default configuration file name.
+	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* spec/default.mspec: remove specific version number.
+	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* common.mk: use ruby organization for rubyspec.
+
 Thu Feb 26 15:48:41 2015  NAKAMURA Usaku  <usa@r...>
 
 	* ext/win32/Win32API.rb (initialize): accept both a string and an array
Index: ruby_2_2/spec/default.mspec
===================================================================
--- ruby_2_2/spec/default.mspec	(revision 50052)
+++ ruby_2_2/spec/default.mspec	(revision 50053)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/spec/default.mspec#L1
-load File.dirname(__FILE__) + '/rubyspec/ruby.2.2.mspec'
+load File.dirname(__FILE__) + '/rubyspec/default.mspec'
 class MSpecScript
   builddir = Dir.pwd
   srcdir = ENV['SRCDIR']
Index: ruby_2_2/common.mk
===================================================================
--- ruby_2_2/common.mk	(revision 50052)
+++ ruby_2_2/common.mk	(revision 50053)
@@ -17,7 +17,7 @@ RUBYLIB       = $(PATH_SEPARATOR) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/common.mk#L17
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
-SPEC_GIT_BASE = git://github.com/nurse
+SPEC_GIT_BASE = git://github.com/ruby
 MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
 RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
 
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50052)
+++ ruby_2_2/version.h	(revision 50053)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.2"
-#define RUBY_RELEASE_DATE "2015-03-03"
-#define RUBY_PATCHLEVEL 86
+#define RUBY_RELEASE_DATE "2015-03-22"
+#define RUBY_PATCHLEVEL 87
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 22
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49689,49752-49753


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