From ae280f3de1eb5006c0bda94e91fe3a91156b73f8 Mon Sep 17 00:00:00 2001
From: Phillip Baker <phillbaker@retrodict.com>
Date: Mon, 26 Oct 2020 23:11:50 -0400
Subject: [PATCH] Release 1.5.0

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b13eecf..31eda3b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,16 @@
 # Changelog
 ## Unreleased
 ### Changed
+-
+
+### Added
+-
+
+## [1.5.0] - 2020-10-26
+### Changed
 - Deprecated elasticsearch_index_lifecycle_policy in favor of elasticsearch_xpack_index_lifecycle_policy.
 - Don't recreate indices which are managed by ILM or ISM for the resource `elasticsearch_index` (#75).
+- Fix opendistro ism policy version conflict
 
 ### Added
 - Validation for kibana objects to prevent provider crashes.