| commit | de3fdc673034e47a1e79b381c426d54b7117c6e8 | [log] [tgz] |
|---|---|---|
| author | Filip Pytloun <filip@pytloun.cz> | Thu May 04 13:52:24 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@5776b83a74fe> | Thu May 04 13:52:24 2017 +0000 |
| tree | 00f99ed7e1ecb303d884cde416883f22f738c2c0 | |
| parent | 522008b3361babb2be7b56c9f8916f026bcfcb06 [diff] | |
| parent | ec54fdc578a18313a5b4071aba3b8831244e93e6 [diff] |
Merge "Try to fix jinja cycle"
diff --git a/heka/map.jinja b/heka/map.jinja index 14c5e4e..f1eba2a 100644 --- a/heka/map.jinja +++ b/heka/map.jinja
@@ -1,3 +1,4 @@ +{%- macro load_grains_file(grains_fragment_file) %}{% include grains_fragment_file ignore missing %}{% endmacro %} {%- load_yaml as server_defaults %} Debian: pkgs: