From 837d30371b01e4531954dcfeff5378a2e6436e29 Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 4 Jan 2015 00:21:08 +0000
Subject: * lib/drb/drb.rb: removed unused argument. Patch by @vipulnsward  
 [fix GH-515]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49130 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 NEWS           | 3 +++
 lib/drb/drb.rb | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a02b4f1a22..e0649825d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jan  4 09:21:04 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/drb.rb: removed unused argument. Patch by @vipulnsward
+	  [fix GH-515]
+
 Sun Jan  4 09:18:31 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* lib/tempfile.rb: provide default basename parameter.
diff --git a/NEWS b/NEWS
index a8d59dbf43..c8ef0cf10b 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,9 @@ with all sufficient information, see the ChangeLog file.
 * lib/webrick/utils.rb
  * removed unused argument. https://github.com/ruby/ruby/pull/356
 
+* lib/drb/drb.rb
+ * removed unused argument. https://github.com/ruby/ruby/pull/515
+
 === Built-in global variables compatibility issues
 
 === C API updates
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index ab352afa1d..d627ec1035 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -745,7 +745,7 @@ module DRb
         end
       end
       if first && (config[:auto_load] != false)
-        auto_load(uri, config)
+        auto_load(uri)
         return open(uri, config, false)
       end
       raise DRbBadURI, 'can\'t parse uri:' + uri
@@ -769,7 +769,7 @@ module DRb
         end
       end
       if first && (config[:auto_load] != false)
-        auto_load(uri, config)
+        auto_load(uri)
         return open_server(uri, config, false)
       end
       raise DRbBadURI, 'can\'t parse uri:' + uri
@@ -792,14 +792,14 @@ module DRb
         end
       end
       if first && (config[:auto_load] != false)
-        auto_load(uri, config)
+        auto_load(uri)
         return uri_option(uri, config, false)
       end
       raise DRbBadURI, 'can\'t parse uri:' + uri
     end
     module_function :uri_option
 
-    def auto_load(uri, config)  # :nodoc:
+    def auto_load(uri)  # :nodoc:
       if uri =~ /^drb([a-z0-9]+):/
         require("drb/#{$1}") rescue nil
       end
-- 
cgit v1.2.3