rallytime 8f80916432 Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/configuration/master.rst - doc/topics/cloud/index.rst - salt/states/cron.py		2016-12-19 14:00:52 -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	doc, conf, pkg: VMWare -> VMware	2016-02-03 14:27:28 -07:00
cloud	Fix millisecond formatting to avoid 1000 as four-digit milliseconds	2016-06-02 17:43:27 +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 '2016.11' into 'develop'	2016-12-19 14:00:52 -07:00
minion	An example configuration for TLS/SSL. (#37859)	2016-11-23 09:38:16 -07:00
proxy	Switch proxy_merge_grains_in_module option default from False to True	2016-11-29 10:51:46 -07:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00