Nicole Thomas 83dee6366c Back-port #29322 to 2015.8 (#32785) ... * add http proxy support for tornado * add proxy_username/password and doc for the minion * add pycurl deps for tornado * fix lint issues * remove hard coded requirements for pycurl, change curl_httpclient to be optional unless proxy_host/port is set * fix lint		2016-04-25 10:46:37 -06: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	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06: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	Catch up the conf/master file to include gitfs/git_pillar parms from recent releases	2016-04-22 13:34:21 -06:00
minion	Back-port #29322 to 2015.8 (#32785)	2016-04-25 10:46:37 -06:00
proxy	Remove SHA1 for SHA256	2016-03-03 21:44:14 +01:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00