rallytime 03b0c97520 Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/ref/configuration/master.rst - doc/ref/configuration/minion.rst		2016-05-25 12:26:00 -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.5' into '2015.8'	2016-05-17 11:23:41 -06:00
minion	Merge branch '2015.5' into '2015.8'	2016-05-25 12:26:00 -06:00
proxy	Remove SHA1 for SHA256	2016-03-03 21:44:14 +01:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00