Browse files

prep for 1.1.1

  • Loading branch information...
1 parent 72e780f commit 0cbf22fe8de493427fe53c1704e48bbf3f978040 @mcdonc mcdonc committed Aug 13, 2011
Showing with 6 additions and 6 deletions.
  1. +4 −4 CHANGES.txt
  2. +1 −1 docs/conf.py
  3. +1 −1 setup.py
View
8 CHANGES.txt
@@ -1,10 +1,10 @@
-1.1.x (unreleased)
+1.1.1 (2011-08-13)
==================
-Additions
----------
+Backported Features
+-------------------
-- Backport from 1.2.x: A new attribute is available on request objects:
+- Backport from 1.2dev: A new attribute is available on request objects:
``exc_info``. Its value will be ``None`` until an exception is caught
by the Pyramid router, after which it will be the result of
``sys.exc_info()``.
View
2 docs/conf.py
@@ -93,7 +93,7 @@ def nothing(*arg):
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.1'
+version = '1.1.1'
# The full version, including alpha/beta/rc tags.
release = version
View
2 setup.py
@@ -53,7 +53,7 @@
install_requires.append('simplejson')
setup(name='pyramid',
- version='1.1',
+ version='1.1.1',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,

0 comments on commit 0cbf22f

Please sign in to comment.