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

This commit is contained in:
Tom Hughes 2014-01-29 22:47:17 +00:00
parent 339ac9d239
commit 3ec53f38a6
2 changed files with 10 additions and 10 deletions

View file

@ -73,7 +73,7 @@ gem 'httpclient'
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

View file

@ -42,10 +42,10 @@ GEM
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)
dalli (2.6.4)
dalli (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)
http_accept_language (2.0.0)
http_accept_language (2.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)
@ -98,7 +98,7 @@ GEM
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)
@ -109,7 +109,7 @@ GEM
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)
@ -133,10 +133,10 @@ GEM
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)
sass (3.2.13)
sass (3.2.14)
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)
dalli (~> 2.6.4)
dalli
deadlock_retry (>= 1.2.0)
dynamic_form
htmlentities