Mike Place 73b4d3c768 Merge pull request #33547 from jf/config-file-patches ... conf/minion: minion supports sha1 hashing as well, so add that in the note as well		2016-05-26 07:48:01 -07:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02:00
cloud.providers.d	doc, conf, pkg: VMWare -> VMware	2016-02-03 14:27:28 -07:00
cloud	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -06:00
cloud.providers	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Merge pull request #33296 from whiteinge/auth-runner	2016-05-26 07:43:55 -07:00
minion	conf/minion: minion supports sha1 hashing as well, so add that in the note	2016-05-26 22:07:35 +08:00
proxy	Merge branch '2016.3' into 'develop'	2016-04-01 10:33:44 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00