From 0cbf22fe8de493427fe53c1704e48bbf3f978040 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 13 Aug 2011 08:38:42 +0200
Subject: [PATCH] prep for 1.1.1
---
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index cd63c10..789195d 100644
--- a/CHANGES.txt
+++ b/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()``.
diff --git a/docs/conf.py b/docs/conf.py
index 5eacb25..66f1625 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.1'
+version = '1.1.1'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 376f503..59056d2 100644
--- a/setup.py
+++ b/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,
--
Gitblit v1.9.3