diff --git a/ChangeLog b/ChangeLog index e8bcc6dd35358a37b62c1619aad22e4fd9d71f3a..3cff81c33c0943831aedb82ecb2f86dc49619223 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ ======= -1.1.2 RELEASE +1.2 RELEASE Updates and enhancements. Check documentation for updating from previous versions - Code Cleanup - Branding diff --git a/README.md b/README.md index 532085ce59dce26f33b261e91d5a282f0ca0a31c..941d9f80c018d11cf68fa453bafb930f615a8c96 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ GRNET's case the flowspec capable device is an EX4200. ##Installation Considerations## - You can find the installation instructions for Debian Wheezy (64) with Django 1.4.x at [Flowspy documentation](http://flowspy.readthedocs.org). If upgrading from a previous version bear in mind the changes introduced in Django 1.4. diff --git a/_version.py b/_version.py index 79d1470bb7d42963316d8b30d313eb68f093b4be..5420f04857134e92e83e6d00c3235aa94d3e35aa 100644 --- a/_version.py +++ b/_version.py @@ -1,4 +1,4 @@ -VERSION = '1.1.2' +VERSION = '1.2' if __name__ == "__main__": print VERSION diff --git a/requirements.txt b/requirements.txt index 13a6e9cee37ad24122447e1e5b3e52801e334628..df3b54be86847b84fb579b4a0d17631419fb5f37 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +django==1.4.5 django-registration==0.8 django-tinymce==1.5 gevent==0.13.6 @@ -13,3 +14,4 @@ pycrypto==2.6 pyparsing==1.5.6 python-dateutil==1.5 python-memcached==1.48 +djangorestframework==3.1.2