salt/salt
Nicole Thomas 7f326c0c17
Merge pull request #46204 from rallytime/merge-develop
[develop] Merge forward from 2018.3 to develop
2018-02-27 10:22:52 -05:00
..
acl
auth Support searching by 'groupattribute' when using freeipa client 2018-02-05 12:49:36 +00:00
beacons Fix traceback in btmp/wtmp beacons 2018-01-25 09:17:13 -06:00
cache Merge branch '2017.7' into 'oxygen' 2018-02-08 11:23:31 -05:00
cli Revert "Separates key_dir from cache_dir, The key files (i.e. '.root_key', '.sudo_...') must not be shared with other masters." 2018-02-08 12:55:25 -07:00
client Merge pull request #45972 from mcalmer/allow-salt-ssh-define-log_file 2018-02-15 13:57:24 -05:00
cloud Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
config Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
daemons Revert "Separates key_dir from cache_dir, The key files (i.e. '.root_key', '.sudo_...') must not be shared with other masters." 2018-02-08 12:55:25 -07:00
defaults
engines Merge branch 'develop' into develop 2018-02-13 16:52:43 -05:00
executors
ext
fileserver Decode all the things (on python2)! 2018-01-30 09:51:51 -06:00
grains Phase 3 - Minor cleanup based on feedback 2018-02-25 11:41:04 +01:00
log Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
modules Merge pull request #46204 from rallytime/merge-develop 2018-02-27 10:22:52 -05:00
netapi Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
output Properly handle undecodable bytestrings in nested outputter 2018-02-12 22:35:45 -06:00
pillar Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
proxy philips_hue: extend docs and fix status with id 2018-01-29 09:01:33 -05:00
queues
renderers Allow gpg renderer to render multiple ciphertexts in a single string 2018-01-30 14:13:01 +00:00
returners Merge branch 'oxygen' into 'develop' 2018-01-29 09:37:19 -05:00
roster Fixed bad clustershell merge. 2018-02-26 17:05:44 +03:00
runners Merge branch 'oxygen' into 'develop' 2018-02-08 11:24:56 -05:00
sdb
serializers
spm
states Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
templates
thorium
tokens
tops
transport Merge branch '2017.7' into '2018.3' 2018-02-23 09:50:19 -05:00
utils Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
wheel
__init__.py
_compat.py
crypt.py salt.crypt: Ensure message is encoded before signing 2018-01-30 09:26:14 -05:00
exceptions.py Move get_context to salt.utils.stringutils 2018-02-07 02:09:56 -06:00
fileclient.py Merge branch 'oxygen' into 'develop' 2018-02-08 11:24:56 -05:00
key.py Revert "Separates key_dir from cache_dir, The key files (i.e. '.root_key', '.sudo_...') must not be shared with other masters." 2018-02-08 12:55:25 -07:00
loader.py Fix inconcistencies in param description 2018-02-07 12:22:11 +03:00
master.py Use M2Crypto instead of Crypto if installed. 2018-01-25 20:28:43 +03:00
minion.py Merge branch 'oxygen' into 'develop' 2018-02-08 11:24:56 -05:00
payload.py Merge branch 'develop' into support_date_payload 2018-02-02 13:48:56 +01:00
runner.py Revert "Separates key_dir from cache_dir, The key files (i.e. '.root_key', '.sudo_...') must not be shared with other masters." 2018-02-08 12:55:25 -07:00
scripts.py Workaroung python bug in traceback.format_exc() 2018-02-14 16:16:57 +03:00
state.py Merge branch '2018.3' into 'develop' 2018-02-26 14:23:06 -05:00
syspaths.py
template.py
textformat.py
version.py Change "locale" value in versions-report to use __salt_system_encoding__ 2018-02-02 09:24:33 -06:00