Merge branch 'master' into python

2018-05-17 16:27:05 +01:00
parent be07072e4f d22b66dfd0
commit e6be41aa15
14 changed files with 73 additions and 52 deletions
--- a/postgres/python.sls
+++ b/postgres/python.sls
@@ -1,4 +1,4 @@
-{% from "postgres/map.jinja" import postgres with context %}
+{% from tpldir + "/map.jinja" import postgres with context %}

 include:
  - postgres.upstream