summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-07 13:38:02 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-07 13:38:02 +0000
commite8402690742a2af5d7d0fa71943ac354c9833ae9 (patch)
treef20da40e76a6e7a4dd4551827df33efd9c04adde
parent79d041dbdeeb95db9ef061c343b524463b5f5235 (diff)
merge revision r48961 partially.
* tool/config_files.rb: use config.guess in gcc repo. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49172 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--tool/config_files.rb2
-rw-r--r--version.h6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index db219f1761..672db57d9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 7 22:34:52 2015 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/config_files.rb: use config.guess in gcc repo.
+
Tue Jan 6 00:04:38 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/ruby/test_io.rb: added timeout for AIX environment.
diff --git a/tool/config_files.rb b/tool/config_files.rb
index 676c355e05..9c2a4c7dab 100644
--- a/tool/config_files.rb
+++ b/tool/config_files.rb
@@ -1,6 +1,6 @@
require 'open-uri'
-ConfigFiles = "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD"
+ConfigFiles = "http://gcc.gnu.org/git/?p=gcc.git;a=blob_plain;f=%s;hb=HEAD"
def ConfigFiles.download(name, dir = nil)
data = URI(self % name).read
file = dir ? File.join(dir, name) : name
diff --git a/version.h b/version.h
index bd1af211d8..5e2f957306 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-01-06"
-#define RUBY_PATCHLEVEL 277
+#define RUBY_RELEASE_DATE "2015-01-07"
+#define RUBY_PATCHLEVEL 278
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 6
+#define RUBY_RELEASE_DAY 7
#include "ruby/version.h"