From 294871876f7bddd00f885659f39712d05e0dd9e4 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 15 Apr 2015 02:31:31 +0200
Subject: [PATCH] prep for 1.5.5
---
setup.py | 2 +-
CHANGES.txt | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index d1cd295..7079ab7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,12 @@
+.. _changes_1.5.5:
+
+1.5.5 (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
+
.. _changes_1.5.4:
1.5.4 (2015-02-24)
diff --git a/setup.py b/setup.py
index f102130..ee792b4 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
]
setup(name='pyramid',
- version='1.5.4',
+ version='1.5.5',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[
--
Gitblit v1.9.3