summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-02-07 02:24:38 +0000
committerChris McDonough <chrism@agendaless.com>2010-02-07 02:24:38 +0000
commite3f338e9beef7738312cd654b189bf69d6f8198d (patch)
treeafb6c261c11a4666eb66a852b89c7923bb54c8d6
parentf7a499c23b451f6f122adac3caff601d0813b3cc (diff)
downloadpyramid-e3f338e9beef7738312cd654b189bf69d6f8198d.tar.gz
pyramid-e3f338e9beef7738312cd654b189bf69d6f8198d.tar.bz2
pyramid-e3f338e9beef7738312cd654b189bf69d6f8198d.zip
Prep for 1.2b6.
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 4 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 8db866117..c44400014 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2b6 (2010-02-06)
+==================
Backwards Incompatibilities
---------------------------
diff --git a/docs/conf.py b/docs/conf.py
index f523345e4..53e2d671c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2b5'
+version = '1.2b6'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 239c66d94..8b84d9cb4 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2b5'
+__version__ = '1.2b6'
import os
import sys