rallytime a5e0141eda Merge branch '2015.8' into '2106.3' ... Conflicts: - salt/beacons/__init__.py - salt/modules/saltutil.py - salt/modules/zypper.py - salt/states/grains.py - salt/states/pkgrepo.py - salt/states/service.py		2016-05-25 13:44:21 -06:00
..
cloud.maps.d	Fixing up salt-cloud sample configs	2013-11-20 08:48:01 -07:00
cloud.profiles.d	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02:00
cloud.providers.d	Updates to cloud docs for the provider > driver change in provider configs.	2015-08-10 09:20:26 -06:00
cloud	Remove trailing white spaces in conf dir file	2016-03-01 17:35:34 +02:00
cloud.profiles	Get rid of Micro Instance examples	2014-09-27 11:09:08 -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 '2015.8' into '2016.3'	2016-05-17 13:41:19 -06:00
minion	Merge branch '2015.8' into '2106.3'	2016-05-25 13:44:21 -06:00
proxy	Documentation updates that go with PR #32252.	2016-03-31 10:41:24 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00