From 5bee607f61614cd8d57e64eacd83c26cbb25a385 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 27 Aug 2011 10:23:45 +0200
Subject: [PATCH] prep for 1.2a2
---
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 10 ++++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index cf1f0ee..d177b61 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 @@
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 23b88b9..22ae65a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -93,7 +93,7 @@
# 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 4082338..c854cf6 100644
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@
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,
--
Gitblit v1.9.3