diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2015-04-07 10:11:46 -0500 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2015-04-07 10:11:46 -0500 |
commit | 6127d0cda4d60c7b30ee1fb40006da11e04512d0 (patch) | |
tree | c6905ea6b5414a64a687dea12cb0ea4631d2e0a1 /Gemfile.lock | |
parent | bdbbe18f3cc527b121bbb2f402898caf4c2fbb15 (diff) | |
parent | fb797ad1f1c3b0d96968c5feef783a2b8fe07eed (diff) | |
download | rails-6127d0cda4d60c7b30ee1fb40006da11e04512d0.tar.gz rails-6127d0cda4d60c7b30ee1fb40006da11e04512d0.tar.bz2 rails-6127d0cda4d60c7b30ee1fb40006da11e04512d0.zip |
Merge branch 'connection-management'
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e767e58784..6fcf4aa39f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,7 @@ PATH action_cable (0.0.2) activesupport (>= 4.2.0) celluloid (~> 0.16.0) + em-hiredis (~> 0.3.0) faye-websocket (~> 0.9.2) GEM @@ -17,10 +18,14 @@ GEM tzinfo (~> 1.1) celluloid (0.16.0) timers (~> 4.0.0) + em-hiredis (0.3.0) + eventmachine (~> 1.0) + hiredis (~> 0.5.0) eventmachine (1.0.7) faye-websocket (0.9.2) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) + hiredis (0.5.2) hitimes (1.2.2) i18n (0.7.0) json (1.8.2) @@ -34,9 +39,9 @@ GEM hitimes tzinfo (1.2.2) thread_safe (~> 0.1) - websocket-driver (0.5.1) + websocket-driver (0.5.3) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.1) + websocket-extensions (0.1.2) PLATFORMS ruby |