From 5bee607f61614cd8d57e64eacd83c26cbb25a385 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 27 Aug 2011 04:23:45 -0400
Subject: prep for 1.2a2

---
 CHANGES.txt  | 10 ++++++++--
 docs/conf.py |  2 +-
 setup.py     |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index cf1f0ee96..d177b619a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,8 @@
-Next release
-============
+1.2a2 (2011-08-27)
+==================
+
+Bug Fixes
+---------
 
 - When a ``renderers=`` argument is not specified to the Configurator
   constructor, eagerly register and commit the default renderer set.  This
@@ -12,6 +15,9 @@ Next release
   Configurator constructor unconditionally registered one that would be
   treated as if it were "the word of the user".
 
+Features
+--------
+
 - A session factory can now be passed in using the dotted name syntax.
 
 1.2a1 (2011-08-24)
diff --git a/docs/conf.py b/docs/conf.py
index 23b88b949..22ae65a44 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.2a1'
+version = '1.2a2'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index 40823384a..c854cf6c6 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ if sys.version_info[:2] < (2, 6):
     install_requires.append('simplejson')
     
 setup(name='pyramid',
-      version='1.2a1',
+      version='1.2a2',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,
-- 
cgit v1.2.3