From b7ba33c549a1dcb4a190cf821b5e9e4cd9f842ee Mon Sep 17 00:00:00 2001
From: Ken Cochrane <KenCochrane@gmail.com>
Date: Tue, 16 Jun 2015 08:41:40 -0400
Subject: [PATCH] bumped the version to 0.3.2 and made it so it installs easier
 with django 1.8

---
 .travis.yml |  3 ++-
 CHANGES     | 21 +++++++++++++++++++++
 README.md   |  2 ++
 setup.py    |  6 +++---
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index af0f8d2..9ccdaeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ python:
 
 env:
   - DJANGO=Django==1.6.11
-  - DJANGO=Django==1.7.7
+  - DJANGO=Django==1.7.8
+  - DJANGO=Django==1.8.2
 
 services:
   - redis-server
diff --git a/CHANGES b/CHANGES
index 4ae31cb..036c62a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,24 @@
+0.3.2
+=====
+added ``DEFENDER_LOCK_OUT_BY_IP_AND_USERNAME``, and changed settings to support
+django 1.8.
+
+0.3.1
+=====
+fixed the management command name
+
+0.3
+===
+
+- Added management command ``cleanup_django_defender`` to clean up access
+    attempt table.
+- Added ``DEFENDER_STORE_ACCESS_ATTEMPTS`` config to say if you want to
+    store attempts to DB or not.
+- Added ``DEFENDER_ACCESS_ATTEMPT_EXPIRATION`` config to specify how long
+    to store the access attempt records in the db, before the management command
+    cleans them up.
+- changed the Django admin page to remove some filters which were making the
+    page load slow with lots of login attempts in the database.
 
 0.2.2
 =====
diff --git a/README.md b/README.md
index 669d7d4..324683b 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,8 @@ Sites using Defender:
 
 Versions
 ========
+- 0.3.2 - added ``DEFENDER_LOCK_OUT_BY_IP_AND_USERNAME``, and changed settings
+    to support django 1.8.
 - 0.3.1 - fixed the management command name
 - 0.3
     - Added management command ``cleanup_django_defender`` to clean up access
diff --git a/setup.py b/setup.py
index bbfb369..5a26aa4 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ except ImportError:
     from distutils.core import setup
 
 
-version = '0.3.1'
+version = '0.3.2'
 
 
 def get_packages(package):
@@ -68,7 +68,7 @@ setup(name='django-defender',
       include_package_data=True,
       packages=get_packages('defender'),
       package_data=get_package_data('defender'),
-      install_requires=['Django>=1.6,<1.8', 'redis==2.10.3',
-                        'hiredis==0.1.6', 'mockredispy==2.9.0.10'],
+      install_requires=['Django>=1.6,<1.9', 'redis==2.10.3',
+                        'hiredis==0.2.0', 'mockredispy==2.9.0.11'],
       tests_require=['mock', 'mockredispy', 'coverage', 'celery'],
       )