Merge branch 'master' into jk_basic_shard_support

This commit is contained in:
Piotr Sarnacki 2013-05-03 02:16:44 +02:00
commit 3ac6e6286a

View File

@ -192,7 +192,7 @@ GEM
multipart-post (1.2.0) multipart-post (1.2.0)
net-http-persistent (2.8) net-http-persistent (2.8)
net-http-pipeline (1.0.1) net-http-pipeline (1.0.1)
newrelic_rpm (3.6.1.85.beta) newrelic_rpm (3.6.1.88)
pg (0.13.2) pg (0.13.2)
polyglot (0.3.3) polyglot (0.3.3)
pry (0.9.12) pry (0.9.12)
@ -207,7 +207,7 @@ GEM
rack (1.4.5) rack (1.4.5)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-protection (1.3.2) rack-protection (1.5.0)
rack rack
rack-ssl (1.3.3) rack-ssl (1.3.3)
rack rack
@ -246,7 +246,7 @@ GEM
redis (~> 3) redis (~> 3)
redis-namespace redis-namespace
signature (0.1.6) signature (0.1.6)
sinatra (1.3.4) sinatra (1.3.6)
rack (~> 1.4) rack (~> 1.4)
rack-protection (~> 1.3) rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
@ -268,7 +268,7 @@ GEM
eventmachine (>= 0.12.6) eventmachine (>= 0.12.6)
rack (>= 1.0.0) rack (>= 1.0.0)
thor (0.14.6) thor (0.14.6)
tilt (1.3.7) tilt (1.4.0)
timers (1.1.0) timers (1.1.0)
treetop (1.4.12) treetop (1.4.12)
polyglot polyglot