Colton Myers 278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/clouds/gce.py		2015-09-01 15:15:13 -06:00
..
esky	fix SPM paths on smartos/illumos esky	2015-08-28 21:42:44 +00:00
salt-master.xml	Add a method context containing the path	2015-07-11 10:12:24 +08: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