From cc3b826025f4911d78393ad3df6310d34bdd6879 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Tue, 28 Feb 2017 11:26:14 +0000
Subject: [PATCH] fixup! Add Django 1.11b1 to Travis as allow_failures

---
 .travis.yml | 2 ++
 tox.ini     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ac4650a60..6429e3039 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,8 @@ matrix:
      python: 3.5
      sudo: true
   allow_failures:
+    # Ignore failures on Elasticsearch tests because ES on Travis is intermittently flaky;
+    # ignore failures on Django 1.11 because we're still working on supporting it
     - env: TOXENV=py27-dj110-mysql-elasticsearch5 INSTALL_ELASTICSEARCH5=yes
     - env: TOXENV=py27-dj111-sqlite-noelasticsearch
     - env: TOXENV=py27-dj111-postgres-noelasticsearch
diff --git a/tox.ini b/tox.ini
index 5df3d5577..303274f38 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,7 +25,7 @@ deps =
     dj18: Django>=1.8.1,<1.9
     dj110: Django>=1.10a1,<1.11
     dj110head: git+https://github.com/django/django.git@stable/1.10.x#egg=Django
-    dj111: Django>=1.11b1,<1.12
+    dj111: Django>=1.11b1,<2.0
     postgres: psycopg2>=2.6
     mysql: mysqlclient==1.3.6
     elasticsearch: elasticsearch>=1,<2