8000 Merge branch 'develop' into slsutil_renderer_support_saltenv · perlchild/salt@68c7ee6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 68c7ee6

Browse files
afischer-opentext-comafischer-opentext-com
authored
Merge branch 'develop' into slsutil_renderer_support_saltenv
2 parents ce36f38 + 5f5b30d commit 68c7ee6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+3384
-398
lines changed

‎.kitchen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ provisioner:
3939
max_retries: 2
4040
remote_states:
4141
name: git://github.com/saltstack/salt-jenkins.git
42-
branch: master
42+
branch: develop
4343
repo: git
4444
testingdir: /testing
4545
salt_copy_filter:

‎doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ clean:
6666

6767
# User-friendly check for sphinx-build
6868
check_sphinx-build:
69-
@which $(SPHINXBUILD) >/dev/null 2>&1 || (echo "The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)" >&2; false)
69+
@which $(SPHINXBUILD) >/dev/null 2>&1 || (echo "The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://www.sphinx-doc.org/en/master/)" >&2; false)
7070

7171
html: check_sphinx-build translations
7272
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

‎doc/_static/proxy_minions.png

-11.8 KB
Loading

‎doc/ref/configuration/master.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5101,6 +5101,33 @@ This can be used to control logging levels more specifically. See also
51015101
:conf_log:`log_granular_levels`.
51025102

51035103

5104+
.. conf_master:: log_rotate_max_bytes
5105+
5106+
``log_rotate_max_bytes``
5107+
------------------------
5108+
5109+
Default: ``0``
5110+
5111+
The maximum number of bytes a single log file may contain before it is rotated.
5112+
A value of 0 disables this feature. Currently only supported on Windows. On
5113+
other platforms, use an external tool such as 'logrotate' to manage log files.
5114+
:conf_log:`log_rotate_max_bytes`
5115+
5116+
5117+
.. conf_master:: log_rotate_backup_count
5118+
5119+
``log_rotate_backup_count``
5120+
---------------------------
5121+
5122+
Default: ``0``
5123+
5124+
The number of backup files to keep when rotating log files. Only used if
5125+
:conf_master:`log_rotate_max_bytes` is greater than 0. Currently only supported
5126+
on Windows. On other platforms, use an external tool such as 'logrotate' to
5127+
manage log files.
5128+
:conf_log:`log_rotate_backup_count`
5129+
5130+
51045131
.. _node-groups:
51055132

51065133
Node Groups

‎doc/ref/configuration/minion.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3103,6 +3103,34 @@ Default: ``{}``
31033103
This can be used to control logging levels more specifically. See also
31043104
:conf_log:`log_granular_levels`.
31053105

3106+
3107+
.. conf_minion:: log_rotate_max_bytes
3108+
3109+
``log_rotate_max_bytes``
3110+
------------------------
3111+
3112+
Default: ``0``
3113+
3114+
The maximum number of bytes a single log file may contain before it is rotated.
3115+
A value of 0 disables this feature. Currently only supported on Windows. On
3116+
other platforms, use an external tool such as 'logrotate' to manage log files.
3117+
:conf_log:`log_rotate_max_bytes`
3118+
3119+
3120+
.. conf_minion:: log_rotate_backup_count
3121+
3122+
``log_rotate_backup_count``
3123+
---------------------------
3124+
3125+
Default: ``0``
3126+
3127+
The number of backup files to keep when rotating log files. Only used if
3128+
:conf_minion:`log_rotate_max_bytes` is greater than 0. Currently only supported
3129+
on Windows. On other platforms, use an external tool such as 'logrotate' to
3130+
manage log files.
3131+
:conf_log:`log_rotate_backup_count`
3132+
3133+
31063134
.. conf_minion:: zmq_monitor
31073135

31083136
``zmq_monitor``

‎doc/ref/modules/all/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ execution modules
213213
keystoneng
214214
keystore
215215
kmod
216-
kubernetes
216+
kubernetesmod
217217
launchctl_service
218218
layman
219219
ldap3

‎doc/ref/modules/all/salt.modules.kubernetes.rst

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎doc/ref/modules/all/salt.modules.kubernetesmod.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
==========================
2+
salt.modules.kubernetesmod
3+
==========================
4+
5+
.. automodule:: salt.modules.kubernetesmod
6+
:members:

‎doc/topics/beacons/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ the minion. The ``beacon`` function therefore cannot block and should be as
322322
lightweight as possible. The ``beacon`` also must return a list of dicts, each
323323
dict in the list will be translated into an event on the master.
324324

325-
Beacons may also choose to implement a ``__validate__`` function which
325+
Beacons may also choose to implement a ``validate`` function which
326326
takes the beacon configuration as an argument and ensures that it
327327
is valid prior to continuing. This function is called automatically
328328
by the Salt loader when a beacon is loaded.

‎doc/topics/development/contributing.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,8 @@ Fork a Repo Guide_>`_ and is well worth reading.
121121
.. note::
122122

123123
If your change fixes a bug or implements a feature already filed in the
124-
`issue tracker <GitHub issue tracker>`_, be sure to reference the issue
124+
`issue tracker`_, be sure to
125+
`reference the issue <https://help.github.com/en/articles/closing-issues-using-keywords>`_
125126
number in the commit message body.
126127

127128
.. code-block:: bash
@@ -562,7 +563,7 @@ Script, see the Bootstrap Script's `Contributing Guidelines`_.
562563

563564
.. _`saltstack/salt`: https://github.com/saltstack/salt
564565
.. _`GitHub Fork a Repo Guide`: https://help.github.com/articles/fork-a-repo
565-
.. _`GitHub issue tracker`: https://github.com/saltstack/salt/issues
566+
.. _`issue tracker`: https://github.com/saltstack/salt/issues
566567
.. _`Fork saltstack/salt`: https://github.com/saltstack/salt/fork
567568
.. _'Git resources`: https://help.github.com/articles/good-resources-for-learning-git-and-github/
568569
.. _`Closing issues via commit message`: https://help.github.com/articles/closing-issues-via-commit-messages

0 commit comments

Comments
 (0)
0