rallytime 8d3c2be61c Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/modules/opkg.py - salt/modules/useradd.py - salt/output/table_out.py - salt/states/mysql_query.py - salt/states/user.py		2018-05-23 12:57:58 -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	[conf] doc typo	2018-03-06 17:36:28 +01: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 'develop'	2018-05-23 12:57:58 -04:00
minion	Updated confusing docstring for tcp_pub/pull_port in conf examples	2018-04-24 02:00:17 +03: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