Permalink
Browse files

Merge pull request #73 from mindreframer/update_eventmachine

eventmachine update, problems with  0.12.10 on some machines... (as repo...
  • Loading branch information...
2 parents ac59d61 + b2afc84 commit 503773bd724ee2af5c53792d9438d28191d8ac92 @markburns markburns committed Sep 27, 2012
Showing with 3 additions and 3 deletions.
  1. +2 −2 Gemfile.lock
  2. +1 −1 slanger.gemspec
View
4 Gemfile.lock
@@ -6,7 +6,7 @@ PATH
em-hiredis (~> 0.1.0)
em-http-request (~> 0.3.0)
em-websocket (~> 0.3.5)
- eventmachine (~> 0.12.10)
+ eventmachine (~> 1.0.0)
glamazon (~> 0.3.1)
rack (~> 1.3)
rack-fiber_pool (= 0.9.1)
@@ -34,7 +34,7 @@ GEM
addressable (>= 2.1.1)
eventmachine (>= 0.12.9)
escape_utils (0.2.4)
- eventmachine (0.12.10)
+ eventmachine (1.0.0)
glamazon (0.3.1)
activesupport (>= 3.1.0)
i18n (~> 0.6.0)
View
2 slanger.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.email = 'sjtgraham@mac.com'
s.homepage = 'http://github.com/stevegraham/slanger'
- s.add_dependency 'eventmachine', '~> 0.12.10'
+ s.add_dependency 'eventmachine', '~> 1.0.0'
s.add_dependency 'em-hiredis', '~> 0.1.0'
s.add_dependency 'em-websocket', '~> 0.3.5'
s.add_dependency 'rack', '~> 1.3'

0 comments on commit 503773b

Please sign in to comment.