rallytime c3ecefc785 Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/file.py - salt/modules/win_service.py - salt/states/mount.py - salt/states/service.py - tests/integration/__init__.py - tests/integration/runners/test_state.py - tests/integration/states/test_file.py - tests/unit/states/test_file.py		2018-08-23 11:50:41 -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	update the default configuration for joyent with a keyname	2017-12-22 20:09:45 +01:00
suse	Merge branch '2017.7' into '2018.3'	2018-08-23 11:50:41 -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 '2017.7' into '2018.3'	2018-08-23 11:50:41 -04:00
minion	Merge branch '2017.7' into 'oxygen'	2017-12-21 15:58:08 -05:00
proxy	highstate output: Document additional output modes	2017-09-25 18:32:52 +02:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00