rallytime bfcfcd75e8 Merge branch '2017.7' into 'develop' ... Conflicts: - salt/fileclient.py - salt/loader.py - salt/minion.py - salt/modules/alternatives.py - salt/modules/genesis.py - tests/unit/modules/test_hosts.py - tests/unit/modules/test_ini_manage.py		2017-09-13 15:15:04 -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	doc, conf, pkg: VMWare -> VMware	2016-02-03 14:27:28 -07:00
suse	Run salt master as dedicated salt user	2017-06-20 17:13:00 +01: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	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
master	Merge branch '2017.7' into 'develop'	2017-08-24 15:33:15 -04: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