merge everything back from mainline branch

[selectricity] / lib / whois / whois.rb

diff --git a/lib/whois/whois.rb b/lib/whois/whois.rb
index 7cc6e9d1eea43efef502e6ac0d4ea406f156b440..962a399c9283b4a12d054f0dcc6d2506d91caf23 100755 (executable)
--- a/lib/whois/whois.rb
+++ b/lib/whois/whois.rb
@@ -130,7 +130,7 @@ module Whois
             if ip_range.include? self.ip and l[1].length > 0
               return Object.instance_eval("Server::#{l[1]}.new")
             end
-            return Server::Ripe.new
+            return Server::Arin.new
           end
         end
 
@@ -139,7 +139,7 @@ module Whois
           ipv6_list = YAML::load_file(File.dirname(__FILE__) + '/data/ipv6.yaml')
           server = server_with_hash(ipv6_list)
           unless server.kind_of? Server::Server
-            return Server::Ripe.new
+            return Server::Arin.new
           else
             return server
           end