Remove version lock on dalli now that ruby-openid is updated

diff --git a/Gemfile b/Gemfile
index 8e06634272b314051dc94350216ecf38048b8304..312f6d60402eb140d6f3ec5dde0b3e18746aa717 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -73,7 +73,7 @@ gem 'httpclient'
 gem 'soap4r-ruby1.9'
 
 # Load memcache client in case we are using it
 gem 'soap4r-ruby1.9'
 
 # Load memcache client in case we are using it

-gem 'dalli', '~> 2.6.4'
+gem 'dalli'

 gem 'kgio'
 
 # Gems useful for development
 gem 'kgio'
 
 # Gems useful for development

diff --git a/Gemfile.lock b/Gemfile.lock
index dd565f1ad3c6740b93766b8d17511a31912613b2..d3b1757e4f50d0b6c88b74543bceb304426145b5 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,10 +42,10 @@ GEM
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script (2.2.0)
       coffee-script-source
       execjs

-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)

     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)
     composite_primary_keys (6.0.1)
       activerecord (>= 4.0.0)

-    dalli (2.6.4)
+    dalli (2.7.0)

     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)


@@ -54,11 +54,11 @@ GEM
       multipart-post (>= 1.2, < 3)
     hike (1.2.3)
     htmlentities (4.3.1)
       multipart-post (>= 1.2, < 3)
     hike (1.2.3)
     htmlentities (4.3.1)

-    http_accept_language (2.0.0)
+    http_accept_language (2.0.1)

     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)
     httpclient (2.3.4.1)
     i18n (0.6.9)
     iconv (0.1)

-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)

       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)


@@ -98,7 +98,7 @@ GEM
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n
       rack-openid (~> 1.3)
     openstreetmap-i18n-js (3.0.0.rc5.3)
       i18n

-    paperclip (3.5.2)
+    paperclip (3.5.3)

       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)


@@ -109,7 +109,7 @@ GEM
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.9)
     r2 (0.2.2)
     rack (1.5.2)
     rack-cors (0.2.9)

-    rack-openid (1.4.1)
+    rack-openid (1.4.2)

       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)


@@ -133,10 +133,10 @@ GEM
     rake (10.1.1)
     redcarpet (3.0.0)
     rinku (1.7.3)
     rake (10.1.1)
     redcarpet (3.0.0)
     rinku (1.7.3)

-    ruby-openid (2.3.0)
+    ruby-openid (2.5.0)

     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)

-    sass (3.2.13)
+    sass (3.2.14)

     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)


@@ -175,7 +175,7 @@ DEPENDENCIES
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)
   composite_primary_keys (>= 6.0.1)
   bigdecimal (~> 1.1.0)
   coffee-rails (~> 4.0.0)
   composite_primary_keys (>= 6.0.1)

-  dalli (~> 2.6.4)
+  dalli

   deadlock_retry (>= 1.2.0)
   dynamic_form
   htmlentities
   deadlock_retry (>= 1.2.0)
   dynamic_form
   htmlentities