Colton Myers d5fbd960fe Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: salt/cloud/clouds/vmware.py salt/fileserver/s3fs.py salt/modules/chocolatey.py salt/modules/s3.py salt/modules/zpool.py salt/pillar/s3.py salt/utils/s3.py tests/unit/modules/s3_test.py		2015-08-03 15:01:35 -06:00
..
esky	Merge pull request #25902 from basepi/merge-forward-2015.8	2015-08-03 14:30:07 -06: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