From 684e94026603fb6c685daafe00b33f8002ecb861 Mon Sep 17 00:00:00 2001
From: James Coglan <jcoglan@gmail.com>
Date: Tue, 23 Dec 2014 00:05:42 +0000
Subject: [PATCH] Bump Faye to 1.1.0.

---
 spec/faye_redis_spec.js | 2 +-
 vendor/faye             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/faye_redis_spec.js b/spec/faye_redis_spec.js
index c9edf72..a58d09e 100644
--- a/spec/faye_redis_spec.js
+++ b/spec/faye_redis_spec.js
@@ -7,7 +7,7 @@ JS.Test.describe("Redis engine", function() { with(this) {
   })
 
   after(function(resume) { with(this) {
-    engine.disconnect()
+    disconnect_engine()
     var redis = require('redis').createClient(6379, 'localhost', {no_ready_check: true})
     redis.auth(engineOpts.password)
     redis.flushall(function() {
diff --git a/vendor/faye b/vendor/faye
index f7c13d1..aab4127 160000
--- a/vendor/faye
+++ b/vendor/faye
@@ -1 +1 @@
-Subproject commit f7c13d18e2c77e3355b9fc63be4f61017030111d
+Subproject commit aab41275917a15eb44d702c21ba30a8b6221f016