rallytime 9ded5e1cbb Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/grains/core.py - salt/modules/win_lgpo.py - salt/returners/mysql.py - salt/states/libcloud_dns.py - tests/integration/runners/test_runner_returns.py - tests/unit/grains/test_core.py		2017-12-21 15:58:08 -05: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	remove openstack driver	2017-12-05 16:09:30 -07:00
suse	Merge branch 'develop' into accept-minions-from-grains	2017-11-17 19:35:53 +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	digitalocean should be one word.	2017-09-19 12:47:16 -06:00
master	Merge branch 'develop' into accept-minions-from-grains	2017-12-04 16:10:32 -05: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