summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-10-16 01:04:28 +0000
committerChris McDonough <chrism@agendaless.com>2009-10-16 01:04:28 +0000
commitaccb5789bacc773fe1829d50773a26f9a253ce22 (patch)
tree706f97dad28bfae32b2e9ffb2855bf3057ce939d
parent0dc26efaddf70c02cac7e84245666340f13abd29 (diff)
downloadpyramid-accb5789bacc773fe1829d50773a26f9a253ce22.tar.gz
pyramid-accb5789bacc773fe1829d50773a26f9a253ce22.tar.bz2
pyramid-accb5789bacc773fe1829d50773a26f9a253ce22.zip
Prep for 1.1a6.
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py4
-rw-r--r--setup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index d6550a5f0..2b3181d9d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.1a6 (2009-10-15)
+==================
Features
--------
diff --git a/docs/conf.py b/docs/conf.py
index 3560ebdb3..0107016f3 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.1a5'
+version = '1.1a6'
# The full version, including alpha/beta/rc tags.
-release = '1.1a5'
+release = '1.1a6'
# 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 e56269773..b8d4f3196 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.1a5'
+__version__ = '1.1a6'
import os
import sys