rallytime 5d7b4e4511 Merge branch 'carbon' into 'develop' ... Conflicts: - conf/master - doc/ref/configuration/logging/index.rst - doc/ref/configuration/master.rst - salt/config/__init__.py - salt/modules/gpg.py		2016-09-30 16:10:33 -06: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 'carbon' into 'develop'	2016-09-30 16:10:33 -06:00
minion	Merge branch '2015.8' into '2016.3'	2016-09-08 10:55:57 -06:00
proxy	Merge branch '2016.3' into 'develop'	2016-08-08 12:34:23 -06:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00