From a5175c2c0cc0e83da3bf5508a7b24d2be78b9229 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sun, 20 Nov 2011 21:38:52 +0100
Subject: [PATCH] prep for 1.2.2
---
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 8816434..248f6d9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2.2 (2011-11-20)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index 4266b6f..f5559bd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -94,7 +94,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2.1'
+version = '1.2.2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 8e77a79..5333cc9 100644
--- a/setup.py
+++ b/setup.py
@@ -59,7 +59,7 @@
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.2.1',
+ version='1.2.2',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,
--
Gitblit v1.9.3