08133114a1
- Add possibility to generate _version.py at the build time for raw builds: https://github.com/saltstack/salt/pull/43955 - Added: * enable-with-salt-version-parameter-for-setup.py-scri.patch - Update to 2017.7.2 See https://docs.saltstack.com/en/develop/topics/releases/2017.7.2.html for full changelog - Fix for CVE-2017-14695 (bsc#1062462) - Fix for CVE-2017-14696 (bsc#1062464) - Fix salt target-type field returns "String" for existing jids but an empty "Array" for non existing jids. (issue #1711) - Added: * bugfix-always-return-a-string-list-on-unknown-job-ta.patch - Fixed minion resource exhaustion when many functions are being executed in parallel (bsc#1059758) - Added: * introduce-process_count_max-minion-configuration-par.patch * multiprocessing-minion-option-documentation-fixes.patch - Remove 'TasksTask' attribute from salt-master.service in older versions of systemd (bsc#985112) - Provide custom SUSE salt-master.service file. - Fix wrong version reported by Salt (bsc#1061407) - list_pkgs: add parameter for returned attribute selection (bsc#1052264) - Adding the leftover for zypper and yum list_pkgs functionality. - Use $HOME to get the user home directory instead using '~' char (bsc#1042749) OBS-URL: https://build.opensuse.org/request/show/533951 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=96
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 6c5b8be3d14814903abc70b5605c87277dad39db Mon Sep 17 00:00:00 2001
|
|
From: Silvio Moioli <smoioli@suse.de>
|
|
Date: Wed, 20 Sep 2017 14:32:47 +0200
|
|
Subject: [PATCH] multiprocessing minion option: documentation fixes
|
|
|
|
---
|
|
doc/man/salt.7 | 1 +
|
|
doc/ref/configuration/minion.rst | 7 +++++--
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/doc/man/salt.7 b/doc/man/salt.7
|
|
index d6cfe937a1..86c463b771 100644
|
|
--- a/doc/man/salt.7
|
|
+++ b/doc/man/salt.7
|
|
@@ -10795,6 +10795,7 @@ cmd_whitelist_glob:
|
|
.UNINDENT
|
|
.UNINDENT
|
|
.SS Thread Settings
|
|
+.SS \fBmultiprocessing\fP
|
|
.sp
|
|
Default: \fBTrue\fP
|
|
.sp
|
|
diff --git a/doc/ref/configuration/minion.rst b/doc/ref/configuration/minion.rst
|
|
index cd554268c1..5cc72f1daf 100644
|
|
--- a/doc/ref/configuration/minion.rst
|
|
+++ b/doc/ref/configuration/minion.rst
|
|
@@ -2164,11 +2164,14 @@ Thread Settings
|
|
|
|
.. conf_minion:: multiprocessing
|
|
|
|
+``multiprocessing``
|
|
+-------
|
|
+
|
|
Default: ``True``
|
|
|
|
-If `multiprocessing` is enabled when a minion receives a
|
|
+If ``multiprocessing`` is enabled when a minion receives a
|
|
publication a new process is spawned and the command is executed therein.
|
|
-Conversely, if `multiprocessing` is disabled the new publication will be run
|
|
+Conversely, if ``multiprocessing`` is disabled the new publication will be run
|
|
executed in a thread.
|
|
|
|
|
|
--
|
|
2.14.2
|
|
|
|
|