diff options
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/vendor/memcache-client-1.7.5/lib/memcache.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/vendor/memcache.rb | 2 |
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 |