rallytime 82e73fe49d Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/ref/tops/all/index.rst - salt/fileclient.py - salt/grains/core.py - salt/modules/win_file.py - salt/pillar/__init__.py - salt/utils/http.py		2018-10-18 10:41:42 -04:00
..
cloud.maps.d	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.profiles.d	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.providers.d	Add Scaleway to cloud providers examples	2018-04-16 15:43:03 +02:00
suse	Merge branch '2018.3' into 'fluorine'	2018-10-18 10:41:42 -04:00
cloud	[conf/cloud] doc typo	2018-03-06 17:32:17 +01:00
cloud.profiles	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.providers	Add Scaleway to cloud providers examples	2018-04-16 15:43:03 +02:00
master	Merge branch '2018.3' into 'fluorine'	2018-10-18 10:41:42 -04:00
minion	Merge branch '2018.3' into 'fluorine'	2018-10-03 09:45:20 -04:00
proxy	Update default renderer to jinja|yaml, improve renderer docs	2018-04-16 22:35:23 -05:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00