From 66585f47e2ccd36be6a3cd5679ccf60161d9db05 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Wed, 12 Apr 2017 22:37:56 -0500
Subject: forward port some history changes from 1.8-branch

---
 HISTORY.txt | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'HISTORY.txt')

diff --git a/HISTORY.txt b/HISTORY.txt
index c10747af4..c69d9514e 100644
--- a/HISTORY.txt
+++ b/HISTORY.txt
@@ -198,6 +198,12 @@ Features
 
   See https://github.com/Pylons/pyramid/pull/2873
 
+- Added a new ``callback`` option to ``config.set_default_csrf_options`` which
+  can be used to determine per-request whether CSRF checking should be enabled
+  to allow for a mix authentication methods. Only cookie-based methods
+  generally require CSRF checking.
+  See https://github.com/Pylons/pyramid/pull/2778
+
 Bug Fixes
 ---------
 
-- 
cgit v1.2.3