Colton Myers c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: salt/fileserver/gitfs.py salt/grains/core.py		2015-01-22 16:46:32 -07:00
..
esky	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2	2015-01-22 16:46:32 -07: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	Add a method context environment PATH	2014-06-22 11:38:35 +02:00
salt-syndic.xml	smartos : change default config directory for Salt services	2013-05-20 13:00:38 +02:00