merge revision(s) 58078:

	export_changelog must specify the branch's url

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 6 deletions

diff --git a/tool/make-snapshot b/tool/make-snapshot
index b650a35ec8..9497b47caf 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -225,7 +225,7 @@ def package(vcs, rev, destdir, tmp = nil)
     unless /\Ar(\d+) / =~ f.readline
       abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'"
     end
-    vcs.export_changelog($1.to_i, revision.to_i, "#{v}/ChangeLog")
+    vcs.export_changelog(url, $1.to_i, revision.to_i, "#{v}/ChangeLog")
   end
 
   open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"}
diff --git a/tool/vcs.rb b/tool/vcs.rb
index 7d1ecd4a88..00f408612a 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -307,7 +307,7 @@ class VCS
       FileUtils.rm_rf(dir+"/.svn")
     end
 
-    def export_changelog(from, to, path)
+    def export_changelog(url, from, to, path)
       range = [to, (from+1 if from)].compact.join(':')
       IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
                %W"svn log -r#{range} #{url}") do |r|
@@ -424,7 +424,7 @@ class VCS
       FileUtils.rm_rf("#{dir}/.git")
     end
 
-    def export_changelog(from, to, path)
+    def export_changelog(url, from, to, path)
       range = [from, to].map do |rev|
         rev or next
         rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'},
diff --git a/version.h b/version.h
index 36977a1fa8..1d899d24dd 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.4.1"
-#define RUBY_RELEASE_DATE "2017-03-22"
-#define RUBY_PATCHLEVEL 111
+#define RUBY_RELEASE_DATE "2017-03-24"
+#define RUBY_PATCHLEVEL 112
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"