Colton Myers 8d8bf3476f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5		2015-06-24 11:12:15 -06:00
..
esky	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-04-07 10:05:35 -06:00
salt-master.xml	pkg/smartos : fix the manifest of salt-master to start@boot	2013-05-30 20:33:16 +02:00
salt-minion.xml	Smartos smf minion fix	2015-06-23 22:34:07 -04:00
salt-syndic.xml	smartos : change default config directory for Salt services	2013-05-20 13:00:38 +02:00