summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-01-21 15:45:49 +0000
committerChris McDonough <chrism@agendaless.com>2010-01-21 15:45:49 +0000
commit611c2e5a7497c10f06d63ea3142702a359dbc55f (patch)
tree372de48c0aeee10d259f6dc327d571aec4c99ede
parent42f38fc21958d9ff855f80aa106d6ece28233d3c (diff)
downloadpyramid-611c2e5a7497c10f06d63ea3142702a359dbc55f.tar.gz
pyramid-611c2e5a7497c10f06d63ea3142702a359dbc55f.tar.bz2
pyramid-611c2e5a7497c10f06d63ea3142702a359dbc55f.zip
Prep for 1.2b2.
-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 410f190c0..21668ca7d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.2b2 (2010-01-21)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index de22f0290..b2c88480f 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.2b1'
+version = '1.2b2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 30db71795..16a025185 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2b1'
+__version__ = '1.2b2'
import os
import sys