From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Tue, 27 Dec 2016 18:53:39 +0000 (+0100)
Subject: Merge branch 'master' of github.com:mitsuhiko/jinja2
X-Git-Tag: 2.9~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67d015e89696866e4b8d97ef369d35a7c2ea97db;p=thirdparty%2Fjinja.git

Merge branch 'master' of github.com:mitsuhiko/jinja2
---

67d015e89696866e4b8d97ef369d35a7c2ea97db
diff --cc CHANGES
index 69ed4508,0c2e125e..c7b5f876
--- a/CHANGES
+++ b/CHANGES
@@@ -4,8 -4,10 +4,10 @@@ Jinja2 Changelo
  Version 2.9
  -----------
  
 -(unreleased feature release)
 -
+ - Change cache key definition in environment. This fixes a performance
+   regression introduced in 2.8.
 +- Added support for `generator_stop` on supported Python versions
 +  (Python 3.5 and later)
  
  Version 2.8.1
  -------------