Merge jdong

diff --git a/app/views/quickvote/list_voters.rhtml b/app/views/quickvote/list_voters.rhtml
index be11290b444cad0bb0bbb0258b4e264bb60343ee..ea276d7b6a7d50570ae059e5348ba82ca6b8b2ab 100644 (file)
--- a/app/views/quickvote/list_voters.rhtml
+++ b/app/views/quickvote/list_voters.rhtml
@@ -27,14 +27,10 @@
             voter.ipaddress =~ /^172\.[1-3]/
             %>
             <% w=nil
-            puts "WHOIS #{voter.ipaddress}"
             if Cache and w=Cache.get("WHOIS:#{voter.ipaddress}")
             elsif Cache
-              puts "CREATE"
               w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)
-              puts "SEARCH"
               w.search_whois
-              puts "DONE"
               Cache.set("WHOIS:#{voter.ipaddress}", w)
             else
               w= Whois::Whois.new(IPAddr.new(voter.ipaddress),true)

diff --git a/config/gmaps_api_key.yml b/config/gmaps_api_key.yml
index 5d89d5a55bdc62a1939291fde194bbcde84cf08d..b0c65fb0eb70554e97bc053b99e5d7049a16686f 100644 (file)
--- a/config/gmaps_api_key.yml
+++ b/config/gmaps_api_key.yml
@@ -9,4 +9,4 @@ test:
  ABQIAAAAzMUFFnT9uH0xq39J0Y4kbhTJQa0g3IQ9GZqIMmInSLzwtGDKaBR6j135zrztfTGVOm2QlWnkaidDIQ\r
 \r
 production:\r
- ABQIAAAAzMUFFnT9uH0Sfg98Y4kbhGFJQa0g3IQ9GZqIMmInSLrthJKGDmlRT98f4j135zat56yjRKQlWnkmod3TB\r
+ ABQIAAAA479zRK1hoNqMcKLTMuBcTRQ0mFvgRda1vOZQqJO6gQItognzGRQueA871M_O5_Q9Pd9xs4Ah4SNYTg\r