From 1af0f6cd4388198130b1b638bdbd8311a26eef33 Mon Sep 17 00:00:00 2001
From: Daniel Roschka <danielroschka@phoenitydawn.de>
Date: Sun, 29 Mar 2015 21:05:23 +0200
Subject: [PATCH 1/2] Add Travis CI support

To improve the code quality of binder, this commit adds support for continuous
integration by using Travis CI (https://travis-ci.org/).
This will ensure that every commit and every pull request will trigger test
runs of the tests included in binder, helping to avoid code with broken tests.
---
 .travis.yml     | 11 +++++++++++
 README.markdown |  2 ++
 2 files changed, 13 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..b08ea74
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python:
+  - "2.7"
+env:
+  - DJANGO="Django>=1.6,<1.7"
+  - DJANGO="Django>=1.7,<1.8"
+install:
+  - pip install -q $DJANGO
+  - pip install -r requirements.txt
+script:
+  - python manage.py test
\ No newline at end of file
diff --git a/README.markdown b/README.markdown
index 115f3ab..723fbe1 100644
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,7 @@
 # Binder #
 
+[![Build Status](https://travis-ci.org/jforman/binder.svg?branch=master)](https://travis-ci.org/jforman/binder)
+
 A Django web application for viewing and editing BIND DNS zone records.
 
 Binder supports adding and deleting DNS records (and eventually editing in place). TSIG-authenticated transfers and updates are supported.

From 8acbc5526bb49ccaca13d748e99250d13a467ee5 Mon Sep 17 00:00:00 2001
From: Daniel Roschka <danielroschka@phoenitydawn.de>
Date: Thu, 2 Apr 2015 07:20:02 +0200
Subject: [PATCH 2/2] Added support for Django 1.8.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b08ea74..18f353f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,9 @@ python:
 env:
   - DJANGO="Django>=1.6,<1.7"
   - DJANGO="Django>=1.7,<1.8"
+  - DJANGO="Django>=1.8,<1.9"
 install:
   - pip install -q $DJANGO
   - pip install -r requirements.txt
 script:
-  - python manage.py test
\ No newline at end of file
+  - python manage.py test