rallytime 838dc12b77 Merge branch '2015.8' into '2016.3' ... Conflicts: - salt/cli/daemons.py - salt/config/__init__.py - salt/exceptions.py - salt/pillar/foreman.py - salt/returners/local_cache.py - salt/states/saltmod.py - salt/utils/__init__.py - salt/utils/cloud.py The merge conflicts in salt/cli/daemons.py are still present in this commit. @s0undt3ch is going to resolve them after this commit.		2016-03-08 10:14:32 -07: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-03-08 10:14:32 -07:00
minion	Merge branch '2015.8' into '2016.3'	2016-03-08 10:14:32 -07:00
proxy	Merge branch '2015.8' into '2016.3'	2016-03-08 10:14:32 -07:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00