summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@dreamhost.com>2012-08-30 10:43:54 -0400
committerDoug Hellmann <doug.hellmann@dreamhost.com>2012-08-30 10:43:54 -0400
commit56f377661e23a894571875db2472e26b8761797f (patch)
treebcfd8b4081a9d7b2493df230fb980a3b1ce9e5ac
parentc21a2ba51f607699215e362191476ce2385003a8 (diff)
downloadcliff-56f377661e23a894571875db2472e26b8761797f.tar.gz
Set up release 1.21.2
Document python 2.6 support; update version in setup.py and history file. Change-Id: I4fd0e0edf09e041a000f9037bffdbb1d03af1936 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
-rw-r--r--docs/source/history.rst4
-rw-r--r--setup.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/source/history.rst b/docs/source/history.rst
index e042116..4fd408c 100644
--- a/docs/source/history.rst
+++ b/docs/source/history.rst
@@ -2,11 +2,13 @@
Release History
=================
-dev
+1.2
- Fix problem with interactive mode ``help`` command.
- Disable logging by default but add a ``--log-file`` option to
re-enable it at runtime.
+ - Add support for python 2.6. (contributed by Mark McClain for
+ OpenStack Quantum)
1.1.2
diff --git a/setup.py b/setup.py
index 04b6b52..f4e15e8 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
PROJECT = 'cliff'
# Change docs/source/conf.py too!
-VERSION = '1.1.2'
+VERSION = '1.2'
# Bootstrap installation of Distribute
import distribute_setup