From b001a146d73348af18cfc4c943d87f2f389349c9 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 17 Nov 2014 09:56:20 +0000
Subject: Add django master to build matrix. Closes #2075.

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a5b6d7d9..4c06acf5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,16 @@ env:
     - TOX_ENV=py2.6-django1.5
     - TOX_ENV=py2.7-django1.4
     - TOX_ENV=py2.6-django1.4
+    - TOX_ENV=py3.4-djangomaster
+    - TOX_ENV=py3.3-djangomaster
+    - TOX_ENV=py2.7-djangomaster
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TOX_ENV=py3.4-djangomaster
+    - env: TOX_ENV=py3.3-djangomaster
+    - env: TOX_ENV=py2.7-djangomaster
 
 install:
   - "pip install tox --download-cache $HOME/.pip-cache"
-- 
cgit v1.2.3