carpenti 08d10376ab implementing retro-compatible behavior ... Using the old salt.engines pillar and merging it with the new salt.[master|minion].engines pillar. This way, it doesn't break previous behavior and permits to define common engines on master and minion. In the merge, the salt.[master|minion].engines pillar takes precedence if conflict as it's the more specific pillar.		2016-10-05 21:14:00 +02:00
..
files	implementing retro-compatible behavior	2016-10-05 21:14:00 +02:00
gitfs	allow state to function without errors if no keys are find in pilar	2016-05-02 09:13:38 -04:00
pkgrepo	Fix URLs in salt.pkgrepo for Raspbian & Ubuntu	2016-08-13 15:29:03 -04:00
api.sls	Merge pull request #166 from irtnog/enable-salt-api-service	2015-08-09 07:58:04 -04:00
cloud.sls	By default don't install cloud dependencies using pip	2016-09-21 17:01:37 +10:00
defaults.yaml	By default don't install cloud dependencies using pip	2016-09-21 17:01:37 +10:00
formulas.jinja	Revert PR #200	2016-02-16 10:20:42 -05:00
formulas.sls	Revert PR #200	2016-02-16 10:20:42 -05:00
map.jinja	[BIGFUX] make pygit2 work with ubuntu xenial	2016-09-13 09:03:06 +02:00
master.sls	Add optional method to remove /etc/salt/master.	2016-07-15 15:13:21 +02:00
minion.sls	Add optional method to remove /etc/salt/minion.	2016-07-15 15:11:55 +02:00
ssh.sls	Remove hardcoded paths with {{ slspath }} variable	2015-06-09 23:05:49 +02:00
standalone.sls	fix minion daemon to be enabled if master_type is set to disable	2016-10-01 11:31:56 +02:00
syndic.sls	use salt_settings.syndic_service so state works on FreeBSD, too	2015-10-13 15:41:41 +02:00