From: Tom Hughes <tom@compton.nu>
Date: Sun, 2 Oct 2011 16:10:37 +0000 (+0100)
Subject: Load memcached in case we are using it
X-Git-Tag: live~6591
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/c3436ec9c415c5ce843d36e1746a3d8b75f50820?ds=inline

Load memcached in case we are using it
---

diff --git a/Gemfile b/Gemfile
index 0a4f1638c..40a8b6628 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,8 +34,8 @@ gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 # Load httpclient for SOAP support for Quova GeoIP queries
 gem 'httpclient'
 
-# Should only load if memcache is in use
-#gem 'memcached'
+# Load memcache in case we are using it
+gem 'memcached'
 
 # Gems needed for running tests
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index dfa191d95..c96607d50 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,6 +60,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    memcached (1.3.3)
     mime-types (1.16)
     multi_json (1.0.3)
     multipart-post (1.1.3)
@@ -150,6 +151,7 @@ DEPENDENCIES
   dynamic_form
   httpclient
   libxml-ruby (>= 2.0.5)
+  memcached
   oauth-plugin (>= 0.4.0.pre7)
   open_id_authentication (>= 1.1.0)
   pg