rallytime 1f0b90aa57 Merge branch '2017.7' into 'develop' ... Conflicts: - salt/cloud/clouds/joyent.py - salt/engines/slack.py		2017-07-26 17:51:36 -06: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	Fix millisecond formatting to avoid 1000 as four-digit milliseconds	2016-06-02 17:43:27 +02: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-07-26 17:51:36 -06:00
minion	Merge branch '2016.11' into '2017.7'	2017-07-20 09:54:08 -06: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