ruby-changes:37827
From: nagachika <ko1@a...>
Date: Mon, 9 Mar 2015 22:30:00 +0900 (JST)
Subject: [ruby-changes:37827] nagachika:r49908 (ruby_2_1): merge revision(s) r49689: [Backport #10953]
nagachika 2015-03-09 22:29:44 +0900 (Mon, 09 Mar 2015) New Revision: 49908 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49908 Log: merge revision(s) r49689: [Backport #10953] * common.mk: use ruby organization for rubyspec. Modified directories: branches/ruby_2_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/common.mk branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 49907) +++ ruby_2_1/ChangeLog (revision 49908) @@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Mon Mar 9 22:27:47 2015 SHIBATA Hiroshi <shibata.hiroshi@g...> + + * common.mk: use ruby organization for rubyspec. + Mon Mar 9 21:52:41 2015 NARUSE, Yui <naruse@r...> * lib/uri/generic.rb (URI::Generic.build): Index: ruby_2_1/common.mk =================================================================== --- ruby_2_1/common.mk (revision 49907) +++ ruby_2_1/common.mk (revision 49908) @@ -14,7 +14,7 @@ RUBYLIB = $(PATH_SEPARATOR) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/common.mk#L14 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_1/version.h =================================================================== --- ruby_2_1/version.h (revision 49907) +++ ruby_2_1/version.h (revision 49908) @@ -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 307 +#define RUBY_PATCHLEVEL 308 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r49689 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/