summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-08-31 22:49:50 -0500
committerMichael Merickel <michael@merickel.org>2016-08-31 22:49:50 -0500
commitab0be8ab6c6001db7ca7644e4d34bbdcb49d70e2 (patch)
tree2bb38d4b374d8e319fecb101d324107368e835c0
parent86d7fc134f481ddc36a36af90ff169bb03471851 (diff)
downloadpyramid-ab0be8ab6c6001db7ca7644e4d34bbdcb49d70e2.tar.gz
pyramid-ab0be8ab6c6001db7ca7644e4d34bbdcb49d70e2.tar.bz2
pyramid-ab0be8ab6c6001db7ca7644e4d34bbdcb49d70e2.zip
add changelog for #2714
-rw-r--r--CHANGES.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 02e3271ce..198dfaab5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -24,6 +24,10 @@ Bug Fixes
and `attr` is involved.
See: https://github.com/Pylons/pyramid/pull/2687
+- Fix a ``FutureWarning`` in Python 3.5 when using ``re.split`` on the
+ ``format`` setting to the ``proutes`` script.
+ See https://github.com/Pylons/pyramid/pull/2714
+
Deprecations
------------