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
..
files	Added recursive management of minion.d and master.d.	2014-10-06 11:56:07 -04:00
cloud.sls	Added functionality to state for salt cloud and exampel for EC2 and GCE	2014-07-20 16:59:38 +02:00
master.sls	Merge remote-tracking branch 'origin/pr/47'	2014-10-09 16:39:07 -06:00
minion.sls	Merge remote-tracking branch 'origin/pr/47'	2014-10-09 16:39:07 -06:00
package-map.jinja	Initial FreeBSD support	2014-10-02 00:20:29 -07:00
syndic.sls	Initial FreeBSD support	2014-10-02 00:20:29 -07:00