From c59784ba29598170207646a8d54fdc020e0ab5b0 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 29 Apr 2015 06:33:31 +0200
Subject: [PATCH] prep 1.5.7
---
docs/whatsnew-1.5.rst | 1 +
setup.py | 2 +-
CHANGES.txt | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 38e4726..4dcf826 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,7 @@
-unreleased
-==========
+.. _changes_1.5.7:
+
+1.5.7 (2015-04-28)
+==================
- Further fix the JSONP renderer by prefixing the returned content with
a comment. This should mitigate attacks from Flash (See CVE-2014-4671).
diff --git a/docs/whatsnew-1.5.rst b/docs/whatsnew-1.5.rst
index a60892e..8e05e7e 100644
--- a/docs/whatsnew-1.5.rst
+++ b/docs/whatsnew-1.5.rst
@@ -21,6 +21,7 @@
- :ref:`changes_1.5.4`
- :ref:`changes_1.5.5`
- :ref:`changes_1.5.6`
+- :ref:`changes_1.5.7`
Major Backwards Incompatibilities
diff --git a/setup.py b/setup.py
index cd7826e..6f7b79f 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@
]
setup(name='pyramid',
- version='1.5.6',
+ version='1.5.7',
description='The Pyramid Web Framework, a Pylons project',
long_description=README + '\n\n' + CHANGES,
classifiers=[
--
Gitblit v1.9.3