Shane Poage f0e691fa13 Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID.		2015-09-01 18:33:18 -05:00
..
files	Fixed pillar_roots generation for salt-master.	2015-08-06 11:37:55 +02:00
gitfs	Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID.	2015-09-01 18:33:18 -05:00
pkgrepo	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
api.sls	Merge pull request #166 from irtnog/enable-salt-api-service	2015-08-09 07:58:04 -04:00
cloud.sls	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
defaults.yaml	Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID.	2015-09-01 18:33:18 -05:00
formulas.jinja	Remove mapping test	2015-08-27 17:37:53 -05:00
formulas.sls	formulas.jinja: python 2.6 support	2015-06-17 17:51:40 +03:00
map.jinja	Fixed conflict with git-formula by allowing either inclusion of formula to install git dependency or specify a package name to install with a custom state ID.	2015-09-01 18:33:18 -05:00
master.sls	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
minion.sls	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
ssh.sls	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
standalone.sls	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
syndic.sls	Fix syntax error	2015-06-19 15:33:16 -06:00