rallytime 71f3c73150 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/template.py - salt/utils/pycrypto.py - tests/integration/modules/test_state.py - tests/unit/states/test_artifactory.py - tests/unit/test_template.py		2017-04-05 13:02:14 -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 '2016.11' into 'develop'	2017-04-05 13:02:14 -06:00
minion	Merge pull request #39701 from rallytime/merge-develop	2017-02-28 12:50:10 -07:00
proxy	tpyo	2017-03-24 01:55:48 +00:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00