Colton Myers 99fc7ecb4b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop ... Conflicts: doc/man/salt-call.1 doc/man/salt-cloud.1 doc/man/salt-cp.1 doc/man/salt.7 salt/cloud/__init__.py salt/fileclient.py salt/modules/file.py salt/modules/gpg.py		2015-06-29 16:49:40 -06:00
..
esky	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -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