Colton Myers 7b50807a12 Merge pull request #25902 from basepi/merge-forward-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8		2015-08-03 14:30:07 -06:00
..
esky	Merge pull request #25902 from basepi/merge-forward-2015.8	2015-08-03 14:30:07 -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