salt/salt
Nicole Thomas bec663ed24
Merge pull request #48023 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-06-08 09:55:00 -04:00
..
acl Update old utils paths to new utils paths 2018-04-05 13:47:22 -04:00
auth Fixed lint error. 2018-05-22 16:10:07 +03:00
beacons Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
cache Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
cli Use six.itervalues() instead of dict.values() 2018-06-01 17:45:27 -05:00
client Merge branch 'develop' into ssh_private_key_pass 2018-05-31 10:52:23 +08:00
cloud Merge branch '2018.3' into 'develop' 2018-06-07 13:03:54 -04:00
config Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
daemons fix pylint 2018-04-30 14:15:53 -05:00
defaults
engines Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
executors add more documentation for new function 2018-06-04 14:01:33 -05:00
ext Merge branch '2017.7' into '2018.3' 2018-04-27 13:38:35 -04:00
fileserver Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
grains Merge pull request #47951 from rares-pop/dev/iepopr/fix_nilinuxrt_core_grains 2018-06-07 10:36:09 -04:00
log Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
modules Merge pull request #48023 from rallytime/merge-develop 2018-06-08 09:55:00 -04:00
netapi Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
output Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
pillar Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
proxy Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
queues
renderers Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
returners Clean up Sphinx build errors in develop branch 2018-06-06 20:19:44 -05:00
roster Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
runners Merge branch '2018.3' into 'develop' 2018-06-07 13:03:54 -04:00
sdb Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
serializers Typo: test_type --> text_type 2018-05-25 16:10:52 -04:00
spm Update default renderer to jinja|yaml, improve renderer docs 2018-04-16 22:35:23 -05:00
states Merge pull request #48023 from rallytime/merge-develop 2018-06-08 09:55:00 -04:00
templates Merge branch 'develop' into add-route-metrics 2018-04-06 13:26:01 -05:00
thorium Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
tokens
tops fixed top function which was broken since commit 002aa88a97 2018-04-04 10:15:02 -05:00
transport Merge branch '2018.3' into 'develop' 2018-05-23 12:57:58 -04:00
utils Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
wheel Merge branch '2017.7' into '2018.3' 2018-06-01 14:54:12 -04:00
__init__.py
_compat.py
crypt.py Always sign and verify bytes 2018-04-27 16:20:18 -07:00
exceptions.py Add support for pypsexec and smbprotocol 2018-04-29 00:36:27 -07:00
fileclient.py Merge branch '2018.3' into 'develop' 2018-05-23 12:57:58 -04:00
key.py
loader.py add docker proxy minion 2018-06-04 14:01:31 -05:00
master.py Merge branch '2018.3' into 'develop' 2018-05-02 15:28:21 -04:00
minion.py add more documentation for new function 2018-06-04 14:01:33 -05:00
payload.py Merge branch '2018.3' into 'develop' 2018-04-10 10:16:50 -04:00
runner.py Merge branch '2018.3' into 'develop' 2018-04-12 11:00:14 -04:00
scripts.py Workaroung python bug in traceback.format_exc() 2018-03-27 11:03:03 -04:00
state.py Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
syspaths.py Merge branch '2018.3' into 'develop' 2018-06-06 13:35:36 -04:00
template.py Replace salt.utils.locales.sdecode with salt.utils.data.decode 2018-05-16 09:14:11 -05:00
textformat.py
version.py Updating version.py to include Magnesium. 2018-04-20 18:34:19 -07:00