Commit Graph

9 Commits

Author SHA1 Message Date
Seth House 1682df8592 Merge remote-tracking branch 'origin/pr/47'
Conflicts:
	salt/master.sls
	salt/minion.sls
2014-10-09 16:39:07 -06:00
Andrew Vant 00e245e20a Added recursive management of minion.d and master.d.
This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.
2014-10-06 11:56:07 -04:00
Kevin Bowling 4675d68bd8 Initial FreeBSD support 2014-10-02 00:20:29 -07:00
Johannes 247e6403a7 Add missing .conf to config files
Closes #45
2014-10-01 18:37:09 +01:00
Love Nyberg 75a1f888eb #12 Moved master and minion config file to .d 2014-09-08 21:38:30 +02:00
Kenneth Wilke a6667cdb81 Isolated package mapping and some fixes
Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made
2013-08-14 14:53:29 -05:00
Thomas S Hatch fa29decc39 Move into salt subdir 2013-07-27 09:30:56 -06:00
Colton Myers 46652ebfda Move everything to root directory for submodule use, Fix #4 2013-07-17 09:35:39 -06:00
Thomas S Hatch 349a077675 Start on salt formula 2013-06-12 17:53:26 -06:00