b17d3e3575
- Fix the usage of custom macros on the spec file. - Fix RES7: different dependency names for python-PyYAML and python-MarkupSafe - Build both python2 and python3 binaries together. - Bugfix: errors in external pillar causes crash instead of report of them (bsc#1068446) - Fix 'user.present' when 'gid_from_name' is set but group does not exist. - Added: * bugfix-the-logic-according-to-the-exact-described-pu.patch * return-error-when-gid_from_name-and-group-does-not-e.patch - Fix "No service execution module loaded" issue (bsc#1065792) - Set SHELL environment variable Added: * fix-bsc-1065792.patch * set-shell-environment-variable-64.patch - Removed unnecessary logging on shutdown (bsc#1050003) - Renamed patch that adds grain fqdns Changed: * catching-error-when-pidfile-cannot-be-deleted Removed: * fix-for-pidfile-removal-logging Renamed: * add-fqdns-grains -> feat-add-grain-for-all-fqdns OBS-URL: https://build.opensuse.org/request/show/569868 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=107
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 461654496d36a264903057a8255aec4eb700e506 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 e0f349931c..5c92b932ab 100644
|
|
--- a/doc/ref/configuration/minion.rst
|
|
+++ b/doc/ref/configuration/minion.rst
|
|
@@ -2337,11 +2337,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.15.1
|
|
|
|
|