rallytime d24776f5e9 Merge branch '2015.8' into '2016.3' ... Conflicts: - conf/master - doc/topics/netapi/index.rst - salt/netapi/__init__.py		2017-01-15 16:07:55 -07: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	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	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 '2015.8' into '2016.3'	2017-01-15 16:07:55 -07:00
minion	add examples of default minion returners	2016-12-19 13:47:40 -07:00
proxy	Add documentation for append_minionid_config_dirs.	2016-08-03 12:36:37 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00