| commit | 6f69e7aa5206e01ae8408fc78855827368b7c67d | [log] [tgz] |
|---|---|---|
| author | Jakub Josef <jjosef@mirantis.com> | Wed Dec 27 17:56:34 2017 +0000 |
| committer | Gerrit Code Review <gerrit2@e9aa877068d1> | Wed Dec 27 17:56:34 2017 +0000 |
| tree | 321e922968cef1ce329142a0428d5acaf5229a53 | |
| parent | df7b5f0f32a9e73df813ed9d7ae9d21c31281621 [diff] | |
| parent | a2bd5e25d76abf06955951218fd53184cd751975 [diff] |
Merge "Handle file_recv option"
diff --git a/salt/files/master.conf b/salt/files/master.conf index d8952e9..5ee0adb 100644 --- a/salt/files/master.conf +++ b/salt/files/master.conf
@@ -177,6 +177,8 @@ {%- endif %} {%- endif %} +file_recv: {{ master.get('file_recv', False) }} + {#- vim: syntax=jinja -#}