rallytime d679c09e65 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/config/__init__.py - salt/utils/parsers.py - tests/unit/config/config_test.py		2016-07-18 10:34:03 -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	Fix millisecond formatting to avoid 1000 as four-digit milliseconds	2016-06-02 17:43:27 +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-07-18 10:34:03 -06:00
minion	Merge pull request #33711 from rallytime/merge-develop-3	2016-06-09 14:12:48 -04:00
proxy	Fix millisecond formatting to avoid 1000 as four-digit milliseconds	2016-06-02 17:43:27 +02:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00