rallytime efb8a8ddf5 Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/configuration/minion.rst - salt/config/__init__.py - salt/minion.py		2016-12-22 10:39:14 -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 pull request #38377 from DSRCorporation/features/consul_cache	2016-12-20 13:36:01 -07:00
minion	Merge branch '2016.3' into '2016.11'	2016-12-22 10:39:14 -07:00
proxy	Prep release notes for 2016.11	2016-10-31 13:05:24 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00