summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-11-29 23:06:04 +0000
committerChris McDonough <chrism@agendaless.com>2009-11-29 23:06:04 +0000
commitd2fb1632eaa28a0baf20dde974bbffe04a024dd1 (patch)
tree6c458d6fa92e7163ce82aa40f87b0ca2fc739f1a
parentc442e411943175f23e2b4d398f3c8eed2ecb59f3 (diff)
downloadpyramid-d2fb1632eaa28a0baf20dde974bbffe04a024dd1.tar.gz
pyramid-d2fb1632eaa28a0baf20dde974bbffe04a024dd1.tar.bz2
pyramid-d2fb1632eaa28a0baf20dde974bbffe04a024dd1.zip
Prep for 1.2a2.
-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 ea351157e..cda5b725c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2a2 (2009-11-29)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 252cb3426..25c662bd6 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.2a1'
+version = '1.2a2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 6253dc6e0..d4cf55cb4 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2a1'
+__version__ = '1.2a2'
import os
import sys