summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-12-10 15:56:22 +0000
committerChris McDonough <chrism@agendaless.com>2009-12-10 15:56:22 +0000
commit3ab57a08c11bf5b8d874e35de6595f53d9e88d9f (patch)
tree702ccf58e883e474c54ab82c1c5ab2d0d67f8b0a
parent29f5c1a101802e0ba66d72195fbe4e9d340a96a0 (diff)
downloadpyramid-3ab57a08c11bf5b8d874e35de6595f53d9e88d9f.tar.gz
pyramid-3ab57a08c11bf5b8d874e35de6595f53d9e88d9f.tar.bz2
pyramid-3ab57a08c11bf5b8d874e35de6595f53d9e88d9f.zip
Prep for 1.2a5.
-rw-r--r--CHANGES.txt5
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 4 insertions, 5 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 024ed8929..5c671dead 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a5 (2009-12-10)
+==================
Features
--------
@@ -49,7 +49,6 @@ Dependencies
downloaded when :mod:`repoze.bfg` ``setup.py test`` or ``setup.py
nosetests`` is invoked).
-
1.2a4 (2009-12-07)
==================
diff --git a/docs/conf.py b/docs/conf.py
index d9c32a172..9a911d14b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,7 +51,7 @@ copyright = '2008-2009, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2a4'
+version = '1.2a5'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 6678775fd..fd41a547b 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2a4'
+__version__ = '1.2a5'
import os
import sys