Mike Place 8f609a5799 Merge pull request #36126 from edlane/develop ... Add keepalives to salt-master created connections for better presence		2016-09-09 18:50:51 +09:00
..
cloud.maps.d	Make sure all sample config files in cloud.maps.d are commented out	2016-09-05 19:12:27 -06:00
cloud.profiles.d	Make sure all sample config files in cloud.profiles.d are commented out	2016-09-05 19:20:33 -06:00
cloud.providers.d	doc, conf, pkg: VMWare -> VMware	2016-02-03 14:27:28 -07:00
cloud	Fix millisecond formatting to avoid 1000 as four-digit milliseconds	2016-06-02 17:43:27 +02:00
cloud.profiles	Make sure cont/cloud.profiles file is commented out	2016-09-05 18:13:02 -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	add keepalive for sockets initiated by master.	2016-09-07 13:25:34 -06:00
minion	Comment all lines in the minion config file	2016-09-05 17:30:59 -06:00
proxy	Merge branch '2016.3' into 'develop'	2016-08-08 12:34:23 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00