Merge branch 'master' into loop_until-no-eval-master

saltstack · Jan 3, 2020 · 01ebfed · 01ebfed
2 parents 69329c8 + ba07d56
commit 01ebfed
Show file tree

Hide file tree

Showing 23 changed files with 4,125 additions and 82 deletions.
diff --git a/doc/ref/modules/all/index.rst b/doc/ref/modules/all/index.rst
@@ -48,6 +48,7 @@ execution modules
     bigip
     bluez_bluetooth
     boto3_elasticache
+    boto3_elasticsearch
     boto3_route53
     boto_apigateway
     boto_asg

diff --git a/doc/ref/modules/all/salt.modules.boto3_elasticsearch.rst b/doc/ref/modules/all/salt.modules.boto3_elasticsearch.rst
@@ -0,0 +1,5 @@
+salt.modules.boto3_elasticsearch module
+=======================================
+
+.. automodule:: salt.modules.boto3_elasticsearch
+    :members:
diff --git a/doc/ref/states/all/index.rst b/doc/ref/states/all/index.rst
@@ -31,6 +31,7 @@ state modules
     bigip
     blockdev
     boto3_elasticache
+    boto3_elasticsearch
     boto3_route53
     boto_apigateway
     boto_asg
@@ -244,6 +245,7 @@ state modules
     rabbitmq_cluster
     rabbitmq_plugin
     rabbitmq_policy
+    rabbitmq_upstream
     rabbitmq_user
     rabbitmq_vhost
     rbac_solaris

diff --git a/doc/ref/states/all/salt.states.boto3_elasticsearch.rst b/doc/ref/states/all/salt.states.boto3_elasticsearch.rst
@@ -0,0 +1,6 @@
+salt.states.boto3_elasticsearch module
+======================================
+
+.. automodule:: salt.states.boto3_elasticsearch
+    :members:
+    :undoc-members:
diff --git a/doc/ref/states/all/salt.states.rabbitmq_upstream.rst b/doc/ref/states/all/salt.states.rabbitmq_upstream.rst
@@ -0,0 +1,6 @@
+=============================
+salt.states.rabbitmq_upstream
+=============================
+
+.. automodule:: salt.states.rabbitmq_upstream
+    :members:
diff --git a/salt/engines/stalekey.py b/salt/engines/stalekey.py
@@ -4,13 +4,16 @@
 have been recently connected and remove their keys if they have not been
 connected for a certain period of time.
 
-Requires that the minion_data_cache option be enabled.
+Requires that the :conf_master:`minion_data_cache` option be enabled.
 
 .. versionadded: 2017.7.0
 
 :configuration:
 
-    Example configuration
+    Example configuration:
+
+    .. code-block:: yaml
+
         engines:
           - stalekey:
               interval: 3600