summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt6
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 71491cb9b..c2c0cc86a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next Release
-============
+1.1b2 (2011-07-13)
+==================
Features
--------
@@ -51,7 +51,7 @@ Bug Fixes
- Views associated with routes with spaces in the route name may not have
been looked up correctly when using Pyramid with ``zope.interface`` 3.6.4
- and better.
+ and better. See https://github.com/Pylons/pyramid/issues/232.
Documentation
-------------
diff --git a/docs/conf.py b/docs/conf.py
index 31d816aff..f0cf5fd53 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.1b1'
+version = '1.1b2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 54e45e14a..55be461e4 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.1b1',
+ version='1.1b2',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,