Tiny patch release to address documentation fails (elastic#1572)

* Update examples with index templates (elastic#1509) date math in ES is using java time where Y changed to y * [DOCS] Fix restore snapshot links * [DOCS] Fix ILM action links * [DOCS] Fix restore snapshot links * Tiny patch release to address documentation fails And a teeny-tiny merge fail that was missed. Co-authored-by: Przemyslaw Gomulka <[email protected]> Co-authored-by: James Rodewig <[email protected]>
tubular · Nov 25, 2020 · a94725f · a94725f
1 parent 0a28b77
commit a94725f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,6 @@ python:
 env:
   - ES_VERSION=5.6.16
   - ES_VERSION=6.8.13
-  - ES_VERSION=7.2.1-linux-x86_64
-  - ES_VERSION=7.3.1-linux-x86_64
-  - ES_VERSION=7.4.2-linux-x86_64
-  - ES_VERSION=7.5.2-linux-x86_64
   - ES_VERSION=7.6.2-linux-x86_64
   - ES_VERSION=7.7.1-linux-x86_64
   - ES_VERSION=7.8.1-linux-x86_64

diff --git a/curator/_version.py b/curator/_version.py
@@ -1,2 +1,2 @@
 """Curator Version"""
-__version__ = '5.8.2'
+__version__ = '5.8.3'
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -3,6 +3,22 @@
 Changelog
 =========
 
+5.8.3 (25 November 2020)
+------------------------
+
+**New**
+
+  * Determined to test the last 2 major version's final patch releases, plus
+    the last 5 minor releases in the current major version. Travis CI testing
+    needs to go faster, and this should suffice. For now, this means versions
+    5.6.16, 6.8.13, 7.6.2, 7.7.1, 7.8.1, 7.9.3, and 7.10.0
+
+**Bug Fixes**
+
+  * Caught a few stale merge failures, and asciidoc documentation problems
+    which needed fixing in the 5.8 branch, which necessitate this tiny bump
+    release. No code changes between 5.8.2 and 5.8.3.
+
 5.8.2 (24 November 2020)
 ------------------------
 

diff --git a/docs/asciidoc/index.asciidoc b/docs/asciidoc/index.asciidoc
@@ -1,4 +1,4 @@
-:curator_version: 5.8.2
+:curator_version: 5.8.3
 :curator_major: 5
 :curator_doc_tree: 5.8
 :es_py_version: 7.1.0