aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-14 00:09:34 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-14 00:09:34 -0500
commit27458464d6cc33ef8aad1d88baa882f4d5556193 (patch)
tree3728f1acbe4574060ca9c0b5c8c41a3f0270494e /activesupport
parentec36edff2de634122645eeaf9b9f9f85f25a19cc (diff)
downloadrails-27458464d6cc33ef8aad1d88baa882f4d5556193.tar.gz
rails-27458464d6cc33ef8aad1d88baa882f4d5556193.tar.bz2
rails-27458464d6cc33ef8aad1d88baa882f4d5556193.zip
Forgot to update load path dir for vendored memcache
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb1
-rw-r--r--activesupport/lib/active_support/vendor/memcache.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb b/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb
index 3adc172a8f..3fcc388ba0 100644
--- a/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb
+++ b/activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb
@@ -1131,4 +1131,3 @@ module Continuum
end
end
-require 'continuum_native' \ No newline at end of file
diff --git a/activesupport/lib/active_support/vendor/memcache.rb b/activesupport/lib/active_support/vendor/memcache.rb
index d0c9c9f8b5..442f50a817 100644
--- a/activesupport/lib/active_support/vendor/memcache.rb
+++ b/activesupport/lib/active_support/vendor/memcache.rb
@@ -1,6 +1,6 @@
begin
require 'memcache'
rescue LoadError
- $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'memcache-client-1.6.5', 'lib'))
+ $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'memcache-client-1.7.5', 'lib'))
retry
end