e628fd1d19
- Update to 2017.7.2 See https://docs.saltstack.com/en/latest/topics/releases/2017.7.2.html - Added: * enable-with-salt-version-parameter-for-setup.py-scri.patch - Removed: * add-a-salt-minion-service-control-file.patch * add-clean_id-function-to-salt.utils.verify.py.patch * add-options-for-dockerng.patch * add-ssh-option-to-salt-ssh.patch * add-unit-test-for-skip-false-values-from-preferred_i.patch * add-yum-plugin.patch * add-zypp-notify-plugin.patch * adding-salt-minion-watchdog-for-sysv-systems-rhel6-a.patch * adding-support-for-installing-patches-in-yum-dnf-exe.patch * avoid-failures-on-sles-12-sp2-because-of-new-systemd.patch * bugfix-jobs-scheduled-to-run-at-a-future-time-stay-p.patch * bugfix-unable-to-use-127-as-hostname.patch * catching-error-when-pidfile-cannot-be-deleted.patch * change-travis-configuration-file-to-use-salt-toaster.patch * check-if-byte-strings-are-properly-encoded-in-utf-8.patch * clean-up-change-attribute-from-interface-dict.patch * do-not-generate-a-date-in-a-comment-to-prevent-rebui.patch * enables-salt-minion-watchdog-on-init.d-script-for-sy.patch * escape-the-os.sep.patch * fix-for-delete_deployment-in-kubernetes-module.patch * fix-format-error-bsc-1043111.patch * fix-grain-for-os_family-on-suse-series.patch * fix-os_family-case-in-unittest.patch * fix-regression-in-file.get_managed-add-unit-tests.patch * fix-salt-summary-to-count-not-responding-minions-cor.patch OBS-URL: https://build.opensuse.org/request/show/540260 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=98
47 lines
1.3 KiB
Diff
47 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 3/6] 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.14.2
|
|
|