update eventmachine

dkln · Mar 17, 2012 · a90e7bd · a90e7bd
1 parent c27aa70
commit a90e7bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'foreman'
 gem 'thin'
-gem 'eventmachine'
+gem 'eventmachine', :git => 'https://github.com/eventmachine/eventmachine.git'
 gem 'em-websocket'
 gem 'json'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,9 @@
+GIT
+  remote: https://github.com/eventmachine/eventmachine.git
+  revision: cc9a3adc5b4cc5640057b396df882220fa46ddd3
+  specs:
+    eventmachine (1.0.0.beta.4)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -24,7 +30,6 @@ GEM
     em-websocket (0.3.5)
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
     execjs (1.2.9)
       multi_json (~> 1.0)
     foreman (0.26.1)
@@ -66,7 +71,7 @@ DEPENDENCIES
   capistrano-ext
   capistrano_colors
   em-websocket
-  eventmachine
+  eventmachine!
   foreman
   guard-coffeescript
   guard-compass