Merge branch 'master' into wip-flask-one

2018-08-30 10:59:00 +02:00
parent f7220924bc 595bb48741
commit 82aa521b5f
2 changed files with 6 additions and 2 deletions
--- a/pillar/tests/config_testing.py
+++ b/pillar/tests/config_testing.py
@@ -44,3 +44,5 @@ ELASTIC_INDICES = {

 # MUST be 8 characters long, see pillar.flask_extra.HashedPathConverter
 STATIC_FILE_HASH = 'abcd1234'
+
+CACHE_NO_NULL_WARNING = True