merge revision(s) r49689: [Backport ruby#10953]

nagachika · nagachika · commit cac1786add33 · 2015-03-09T13:29:44.000Z
* common.mk: use ruby organization for rubyspec.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  9 22:27:47 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* common.mk: use ruby organization for rubyspec.
+
 Mon Mar  9 21:52:41 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* lib/uri/generic.rb (URI::Generic.build):
diff --git a/common.mk b/common.mk
@@ -14,7 +14,7 @@ RUBYLIB       = $(PATH_SEPARATOR)
 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
 
diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 #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

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +Mon Mar  9 22:27:47 2015  SHIBATA Hiroshi  <[email protected]>
++
 +	* common.mk: use ruby organization for rubyspec.
++
 Mon Mar  9 21:52:41 2015  NARUSE, Yui  <[email protected]>
 	* lib/uri/generic.rb (URI::Generic.build):