Merge pull request petergoldstein#342 from vipulnsward/master

Change Source, Fix Typo and remove unused line
sschu · Mar 14, 2013 · 58c2434 · 58c2434
2 parents c0a9b28 + 724f6ab
commit 58c2434
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

diff --git a/lib/dalli/client.rb b/lib/dalli/client.rb
@@ -274,7 +274,7 @@ def touch(key, ttl=nil)
 
     ##
     # Collect the stats for each server.
-    # You can optionaly pass a type including :items or :slabs to get specific stats
+    # You can optionally pass a type including :items or :slabs to get specific stats
     # Returns a hash like { 'hostname:port' => { 'stat1' => 'value1', ... }, 'hostname2:port' => { ... } }
     def stats(type=nil)
       type = nil if ![nil, :items,:slabs].include? type

diff --git a/test/memcached_mock.rb b/test/memcached_mock.rb
@@ -63,7 +63,6 @@ def find_memcached
       end
 
       raise Errno::ENOENT, "Unable to find memcached 1.4+ locally"
-      nil
     end
 
     def memcached(port=19122, args='', options={})
-Original file line number
+Diff line change
@@ Expand Up / @@ -63,7 +63,6 @@ def find_memcached @@
           end
           raise Errno::ENOENT, "Unable to find memcached 1.4+ locally"
-          nil
         end
         def memcached(port=19122, args='', options={})
@@ Expand Down @@