rallytime 308aa5fd61 Merge branch '2016.3' into 'develop' ... Conflicts: - conf/master - conf/minion - doc/ref/proxy/all/index.rst - salt/cli/daemons.py - salt/modules/key.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/utils/__init__.py - salt/utils/cloud.py - tests/unit/daemons_test.py		2016-03-18 10:57:15 -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	doc, conf, pkg: VMWare -> VMware	2016-02-03 14:27:28 -07: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 '2016.3' into 'develop'	2016-03-18 10:57:15 -06:00
minion	Merge branch '2016.3' into 'develop'	2016-03-18 10:57:15 -06:00
proxy	Merge branch '2016.3' into 'develop'	2016-03-18 10:57:15 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00