From 6d5d379caf8d138f75ac67194979a2948cb2e6a2 Mon Sep 17 00:00:00 2001
From: Sean Grove <s@bushi.do>
Date: Fri, 30 Mar 2012 17:24:06 -0700
Subject: [PATCH] Bump _bushido-faye

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2855ae0c..29e6094a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'bushido'
 
 # Server/transport gems
 gem 'thin'
-gem '_bushido-faye'
+gem '_bushido-faye', '0.8.2'
 
 # Helper gems
 gem 'kaminari'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e587e51..f6eb20c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    _bushido-faye (0.8.1)
+    _bushido-faye (0.8.2)
+      _bushido-faye-websocket (>= 0.4.0)
       cookiejar (>= 0.3.0)
       em-http-request (>= 0.3.0)
       eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.4.0)
       rack (>= 1.0.0)
       yajl-ruby (>= 1.0.0)
+    _bushido-faye-websocket (0.4.4)
+      eventmachine (>= 0.12.0)
     actionmailer (3.2.2)
       actionpack (= 3.2.2)
       mail (~> 2.4.0)
@@ -88,8 +90,6 @@ GEM
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    faye-websocket (0.4.4)
-      eventmachine (>= 0.12.0)
     highline (1.6.11)
     hike (1.2.1)
     httparty (0.8.1)
@@ -196,7 +196,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  _bushido-faye
+  _bushido-faye (= 0.8.2)
   aws-sdk
   bourbon
   bushido