4 Commits

Author	SHA1	Message	Date
Niels Abspoel	caff23424d	fix default dict	2017-01-12 23:40:41 +01:00
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
carpenti	c27bfd92b7	make the configuration of engines specific to master or minion ... the engines are now configured using the following pillars: * salt.master.engines * salt.minion.engines instead of a global salt.engines pillar. Note: the pillar.example provided seems to assume this behaviour. (the pillar is salt.master.engines.slack and not salt.engines.slack)	2016-10-05 10:26:36 +02:00
Christian McHugh	ac4ed62c03	Support engine configuration	2016-05-27 23:27:55 -05:00