Merge branch 'release/0.6' into develop

saxix · Oct 1, 2013 · b9a3ac4 · b9a3ac4
2 parents 1f8fe95 + 725c810
commit b9a3ac4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,5 @@
-Release 0.6.0 (beta)
----------------------------------
+Release 0.6.0
+-------------
 
 * new :ref:`disable_concurrency` context manager
 * added documentation for :ref:`concurrency.middleware.ConcurrencyMiddleware <concurrencymiddleware>`
@@ -11,7 +11,7 @@ Release 0.6.0 (beta)
 
 
 Release 0.5.0
----------------------------------
+-------------
 
 * python 3.x compatibility
 * new :setting:`CONCURRENCY_FIELD_SIGNER`

diff --git a/concurrency/__init__.py b/concurrency/__init__.py
@@ -2,7 +2,7 @@
 import datetime
 import os
 
-VERSION = __version__ = (0, 6, 0, 'beta', 1)
+VERSION = __version__ = (0, 6, 0, 'final', 0)
 __author__ = 'sax'
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -53,7 +53,7 @@
     'sphinx': ('http://sphinx.readthedocs.org/en/latest/', None),
 }
 
-next_version = '0.6'
+next_version = '0.7'
 todo_include_todos = True
 
 # Add any paths that contain templates here, relative to this directory.