rallytime b4366103a6 Merge branch '2016.11' into 'develop' ... Conflicts: - .pylintrc - .testing.pylintrc - salt/fileclient.py - salt/minion.py - salt/modules/docker.py - salt/modules/win_iis.py - salt/states/docker.py - salt/states/file.py - salt/utils/__init__.py - tests/integration/modules/test_sysmod.py		2017-02-27 15:11:37 -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	salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210)	2017-02-09 09:50:45 -07:00
minion	Merge branch '2016.11' into 'develop'	2017-02-27 15:11:37 -07:00
proxy	Fix comments about file backup directory	2017-02-26 22:49:29 +01:00
roster	Added default config for salt-ssh	2013-10-01 23:54:51 +10:00