Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2025-04-21 08:14:39 +02:00
Code Issues Activity

Merge 6282d9570ce47da0dff46760a5180d720e357953 into d47edecafd1ee97e4e8d224bde2403b4bce50a81

Browse Source
This commit is contained in:
Justin Phelps 2013-08-23 14:04:52 -07:00
commit 4ab9284467
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/minion
View File

@ -17,7 +17,7 @@
# Per default the minion will automatically include all config files
# from minion.d/*.conf (minion.d is a directory in the same directory
# as the main minion config file).
{{ get_config('default_include', 'master.d/*.conf') }}
{{ get_config('default_include', 'minion.d/*.conf') }}
# Set the location of the salt master server, if the master server cannot be
# resolved, then the minion will fail to start.