summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-09 13:29:44 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-03-09 13:29:44 +0000
commitcac1786add3304434e5b6ab1b9cfda5df0f8fcd0 (patch)
tree56a3025d14fac4a0afff574a15ac33143fa1c8f0
parent2d5f7e5e17ef2a05b4218d7a889453897afa72be (diff)
merge revision(s) r49689: [Backport #10953]
* 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
-rw-r--r--ChangeLog4
-rw-r--r--common.mk2
-rw-r--r--version.h2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 30ae55d9d3..0461046995 100644
--- 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
index de1b671fdd..6508c4c023 100644
--- 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
index d9600bb35b..6e6bf8635a 100644
--- 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