From 56f377661e23a894571875db2472e26b8761797f Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug.hellmann@dreamhost.com>
Date: Thu, 30 Aug 2012 10:43:54 -0400
Subject: Set up release 1.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>
---
 docs/source/history.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docs')

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
 
-- 
cgit v1.2.1