From b5d6c01e44495fdd920b2a54af33839029d7c4e5 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 25 Feb 2015 01:54:07 +0100
Subject: [PATCH] prep 1.5.4

---
 docs/whatsnew-1.5.rst |    1 +
 setup.py              |    2 +-
 CHANGES.txt           |    4 +++-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ac9266c..d1cd295 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
-1.5.4 (unreleased)
+.. _changes_1.5.4:
+
+1.5.4 (2015-02-24)
 ==================
 
 - Fix regression where ``pserve --reload`` would not work when running
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index 4928433..ff5ac44 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -18,6 +18,7 @@
 - :ref:`changes_1.5.1`
 - :ref:`changes_1.5.2`
 - :ref:`changes_1.5.3`
+- :ref:`changes_1.5.4`
 
 
 Major Backwards Incompatibilities
diff --git a/setup.py b/setup.py
index 6d88caa..f102130 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
     ]
 
 setup(name='pyramid',
-      version='1.5.3',
+      version='1.5.4',
       description='The Pyramid Web Framework, a Pylons project',
       long_description=README + '\n\n' +  CHANGES,
       classifiers=[

--
Gitblit v1.9.3