From b7cdd6994d62fceba7bc82900316779cc117149c Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 29 Apr 2015 06:53:26 +0200
Subject: [PATCH] prep 1.4.9
---
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 7 ++++++-
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index b294c33..f23b220 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-1.4.8 (2014-04-28)
+1.4.9 (2014-04-28)
==================
- Further fix the JSONP renderer by prefixing the returned content with
@@ -9,6 +9,11 @@
fix was overly-restrictive and broke Angular.
See https://github.com/Pylons/pyramid/pull/1647
+1.4.8 (2015-04-14)
+==================
+
+- 1.4.7 had some missing files.
+
1.4.7 (2015-04-14)
==================
diff --git a/docs/conf.py b/docs/conf.py
index 1e93d7a..67b39c9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -83,7 +83,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4.8'
+version = '1.4.9'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index e2efde2..1959d81 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@
]
setup(name='pyramid',
- version='1.4.8',
+ version='1.4.9',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,
--
Gitblit v1.9.3