saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #50387 from rallytime/bp-50339

Browse source 
Back-port #50339 to 2018.3
This commit is contained in:
Nicole Thomas 2018-11-05 15:03:14 -05:00 • committed by GitHub
commit 493d6538bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/config/__init__.py
View file

@ -93,6 +93,7 @@ def _gather_buffer_space():
# Return the higher number between 5% of the system memory and 10MiB
return max([total_mem * 0.05, 10 << 20])
# For the time being this will be a fixed calculation
# TODO: Allow user configuration
_DFLT_IPC_WBUFFER = _gather_buffer_space() * .5
@ -3488,7 +3489,7 @@ def check_driver_dependencies(driver, dependencies):
if value is False:
log.warning(
"Missing dependency: '%s'. The %s driver requires "
"'%s' to be installed.", key, key, driver
"'%s' to be installed.", key, driver, key
)
ret = False