From 71eb00ac73716b1ee1bdaf72d84e007dec6d871e Mon Sep 17 00:00:00 2001
From: Bertrand Bordage <bordage.bertrand@gmail.com>
Date: Mon, 6 Oct 2014 15:30:42 +0200
Subject: [PATCH] Version 0.6.0.

---
 CHANGELOG.rst        | 6 ++++++
 README.rst           | 7 +++----
 cachalot/__init__.py | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c1a863f..8c5b6a3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 What’s new in django-cachalot?
 ==============================
 
+0.6.0
+-----
+
+- Adds memcached support
+
+
 0.5.0
 -----
 
diff --git a/README.rst b/README.rst
index ae7b317..432926c 100644
--- a/README.rst
+++ b/README.rst
@@ -24,9 +24,9 @@ Requirements
 
 - Django 1.6 or 1.7
 - Python 2.6, 2.7, 3.2, 3.3, or 3.4
-- `locmem <https://docs.djangoproject.com/en/1.7/topics/cache/#local-memory-caching>`_
-  or `django-redis <https://github.com/niwibe/django-redis>`_
-  (memcached coming soon)
+- `locmem <https://docs.djangoproject.com/en/1.7/topics/cache/#local-memory-caching>`_,
+  `django-redis <https://github.com/niwibe/django-redis>`_ or
+  `memcached <https://docs.djangoproject.com/en/1.7/topics/cache/#memcached>`_
 - SQLite, PostgreSQL or MySQL (it should work with Oracle,
   but I don’t have 17.5k$ to test)
 
@@ -134,7 +134,6 @@ For version 1.0
 
 - Find out if it’s thread-safe and test it
 - Write tests for `multi-table inheritance <https://docs.djangoproject.com/en/1.7/topics/db/models/#multi-table-inheritance>`_
-- Add memcached support
 - Handle multiple databases
 - Add invalidation on migrations in Django 1.7 (& South?)
 
diff --git a/cachalot/__init__.py b/cachalot/__init__.py
index 3216f60..53238ec 100644
--- a/cachalot/__init__.py
+++ b/cachalot/__init__.py
@@ -1,4 +1,4 @@
 from .settings import cachalot_settings
 
-__version__ = (0, 5, 0, 'post')
+__version__ = (0, 6, 0)
 version_string = '.'.join(str(n) for n in __version__)