commit 831bad54dba92f302a2c50928130cc0db7d771f9
author Nolan Lawson <nolan.lawson@gmail.com> Sun May 24 16:03:09 2015 -0400
committer Nolan Lawson <nolan.lawson@gmail.com> Sun May 24 16:03:09 2015 -0400
tree 171f1c0c140e8e2aeb3a0ef96cdf59c2b8b1e34c
parent 6a31c99f167ca6f2701be1762cac364b531f7fa0

(#3721) - re-enable couchdb master in Travis

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index b636768..22a66fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,8 +81,6 @@
 
   allow_failures:
   - env: GREP=test.replication.js CLIENT=node SERVER=sync-gateway BAIL=0 COMMAND=test
-  - env: CLIENT=node SERVER=couchdb-master COMMAND=test
-  - env: SKIP_MIGRATION=true CLIENT=selenium:firefox SERVER=couchdb-master COMMAND=test
 
   fast_finish: true