Merge pull request #1269 from untergeek/multi/empty_filter

Update Changelog
elastic · Sep 11, 2018 · a69dba1 · a69dba1
2 parents 48126f5 + 2ade4bf
commit a69dba1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/curator/_version.py b/curator/_version.py
@@ -1 +1 @@
-__version__ = '5.5.4'
+__version__ = '5.6.0.dev'
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,18 @@
 Changelog
 =========
 
+5.6.0 (? ? ?)
+-------------
+
+**New**
+
+  * The ``empty`` filter has been exposed for general use.  This filter matches
+    indices with no documents. (jrask) #1264
+
+**Documentation**
+
+  * Added Reindex example to the sidebar. (Nostalgiac) #1227
+
 5.5.4 (23 May 2018)
 -------------------
 

diff --git a/docs/asciidoc/filters.asciidoc b/docs/asciidoc/filters.asciidoc
@@ -452,7 +452,7 @@ removed from the actionable list, leaving `index-2017.03.03`,
 -------------
 
 This <<filtertype,filtertype>> will iterate over the actionable list and match
-indices which does not contain any documents.  They will remain in, or be
+indices which do not contain any documents.  They will remain in, or be
 removed from the actionable list based on the value of <<fe_exclude,exclude>>.
 
 By default the indices matched by the empty filter will be excluded since 

diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -1,13 +1,9 @@
-<<<<<<< HEAD
-:curator_version: 5.3.0
-=======
-:curator_version: 5.5.4
->>>>>>> 5.x
+:curator_version: 5.6.0
 :curator_major: 5
-:curator_doc_tree: 5.5
-:es_py_version: 6.2.0
-:es_doc_tree: 6.2
-:pybuild_ver: 3.6.5
+:curator_doc_tree: 5.6
+:es_py_version: 6.3.1
+:es_doc_tree: 6.4
+:pybuild_ver: 3.6.6
 :ref:  http://www.elastic.co/guide/en/elasticsearch/reference/{es_doc_tree}
 
 [[curator-reference]]