Merge pull request #25409 from rallytime/bp-24422

Back-port #24422 to 2015.8
saltstack · Jul 14, 2015 · 334eafa · 334eafa
2 parents 17daf76 + a0130f5
commit 334eafa
Show file tree

Hide file tree

Showing 6 changed files with 619 additions and 143 deletions.
diff --git a/doc/ref/states/all/salt.states.elasticsearch_index.rst b/doc/ref/states/all/salt.states.elasticsearch_index.rst
@@ -0,0 +1,6 @@
+===============================
+salt.states.elasticsearch_index
+===============================
+
+.. automodule:: salt.states.elasticsearch_index
+    :members:
diff --git a/doc/ref/states/all/salt.states.elasticsearch_index_template.rst b/doc/ref/states/all/salt.states.elasticsearch_index_template.rst
@@ -0,0 +1,6 @@
+========================================
+salt.states.elasticsearch_index_template
+========================================
+
+.. automodule:: salt.states.elasticsearch_index_template
+    :members: