garethgreenaway 7091f8ec71 Merge branch 'develop' into issue36942		2017-09-22 16:33:29 -07: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	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
suse	Add jinja environment default options.	2017-08-16 20:02:13 -04:00
cloud	flesh out saltify driver	2017-08-07 10:21:48 -06:00
cloud.profiles	Back-port #36062 to 2015.8 (#36118)	2016-09-07 16:01:34 -06:00
cloud.providers	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
master	Merge branch 'develop' into issue36942	2017-09-22 16:33:29 -07:00
minion	Merge branch '2016.11' into '2017.7'	2017-09-11 12:24:10 -04:00
proxy	Replace Nitrogen with 2017.7.0 in remain directories	2017-06-14 12:18:37 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00