From 405a421a89c2f3982cc9690e7a538c06494a478a Mon Sep 17 00:00:00 2001
From: Alisha Mayor <amayor@splunk.com>
Date: Thu, 3 Sep 2020 14:16:50 -0700
Subject: [PATCH] Update changelog for Release/8.0.6 and 8.0.5.1 (#417)

---
 Makefile          |  4 ++--
 docs/CHANGELOG.md | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 65899a3d..3dadb9fb 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop
 SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml
 # Set Splunk version/build parameters here to define downstream URLs and file names
 SPLUNK_PRODUCT := splunk
-SPLUNK_VERSION := 8.0.5
-SPLUNK_BUILD := a1a6394cc5ae
+SPLUNK_VERSION := 8.0.6
+SPLUNK_BUILD := 152fb4b2bb96
 ifeq ($(shell arch), s390x)
 	SPLUNK_ARCH = s390x
 else
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 0e65e17e..f513fd04 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Navigation
 
+* [8.0.6](#806)
+* [8.0.5.1](#8051)
 * [8.0.5](#805)
 * [8.0.4.1](#8041)
 * [8.0.4](#804)
@@ -35,6 +37,35 @@
 
 ---
 
+## 8.0.6
+
+#### What's New?
+* Releasing new images to support Splunk Enterprise maintenance patch.
+
+#### docker-splunk changes:
+* Bumping Splunk version. For details, see [Fixed issues for 8.0.6](https://docs.splunk.com/Documentation/Splunk/8.0.6/ReleaseNotes/Fixedissues)
+* Test rewrite for parallelization
+* Decouples `etc` backup directory from `SPLUNK_HOME`
+* Added tests and documentation for new features
+
+#### splunk-ansible changes:
+* Support for declarative admin password, enabling password updates and rotations. `splunk.password` will always be the password for the admin user and changes to `splunk.password` will drive password reconciliation.
+* Added flag to disable pop-ups and new user tour
+* Fixed default variable propagation order
+
+---
+
+## 8.0.5.1
+
+#### What's New?
+* New Splunk Enterprise maintenance patch. For details, see [Fixed issues for 8.0.5.1](https://docs.splunk.com/Documentation/Splunk/8.0.5/ReleaseNotes/Fixedissues)
+* Bundling in changes to be consistent with the release of [8.0.6](#806)
+
+#### Changes
+* See [8.0.6](#806) changes
+
+---
+
 ## 8.0.5
 
 #### What's New?