summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-09-23 04:01:27 +0000
committerChris McDonough <chrism@agendaless.com>2009-09-23 04:01:27 +0000
commit87c9f9f146c4f8081accbce450d55ab5bd94a194 (patch)
tree9d513d584d11ee533dee3b205faa65498bed9547
parenta5a9547555f07596cfc0c15a46a8d3281eb531c9 (diff)
downloadpyramid-87c9f9f146c4f8081accbce450d55ab5bd94a194.tar.gz
pyramid-87c9f9f146c4f8081accbce450d55ab5bd94a194.tar.bz2
pyramid-87c9f9f146c4f8081accbce450d55ab5bd94a194.zip
Prep for 1.1a4.
-rw-r--r--CHANGES.txt5
-rw-r--r--docs/conf.py4
-rw-r--r--setup.py2
3 files changed, 5 insertions, 6 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index ed4dd29ff..bd28f160b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1a4 (2009-09-23)
+==================
Bug Fixes
---------
@@ -75,7 +75,6 @@ Internal
- General speed microimprovements for helloworld benchmark: replace
try/excepts with statements which use 'in' keyword.
-
1.1a3 (2009-09-16)
==================
diff --git a/docs/conf.py b/docs/conf.py
index 27c9ee8e9..750f87753 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = '2008-2009, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.1a3'
+version = '1.1a4'
# The full version, including alpha/beta/rc tags.
-release = '1.1a3'
+release = '1.1a4'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
diff --git a/setup.py b/setup.py
index 8e196b1de..b0bd0015a 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.1a3'
+__version__ = '1.1a4'
import os
import sys