From 3fa1b7412139be9247c84b7393c6b15690408dfe Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 15 Apr 2015 00:32:33 +0200
Subject: [PATCH] prep for 1.4.7
---
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 7 +++++++
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 26b6e0b..a412227 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,10 @@
+1.4.7 (2015-04-14)
+==================
+
+- The JSONP renderer created JavaScript code in such a way that a callback
+ variable could be used to arbitrarily inject javascript into the response
+ object. https://github.com/Pylons/pyramid/pull/1626
+
1.4.6 (2014-05-31)
==================
diff --git a/docs/conf.py b/docs/conf.py
index 3f60c87..f7c67dd 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -82,7 +82,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4.6'
+version = '1.4.7'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index e57c308..eaaa2eb 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
]
setup(name='pyramid',
- version='1.4.6',
+ version='1.4.7',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,
--
Gitblit v1.9.3