Merge branch 'develop' into DATAGO-30302/upgrading-vault-to-1.8.11

SolaceDev · Jul 15, 2022 · b3cadd7 · b3cadd7
2 parents e4b7208 + c4ab664
commit b3cadd7
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -56,7 +56,6 @@ Improvements:
 * Add `server.route.activeService` to configure if the route should use the active service [GH-570](https://github.com/hashicorp/vault-helm/pull/570)
 * Support configuring `global.imagePullSecrets` from a string array [GH-576](https://github.com/hashicorp/vault-helm/pull/576)
 
-
 ## 0.13.0 (June 17th, 2021)
 
 Improvements:

diff --git a/Chart.yaml b/Chart.yaml
@@ -4,6 +4,7 @@ version: 0.17.1
 appVersion: 1.8.4
 kubeVersion: ">= 1.14.0-0"
 description: Install and configure Vault on Kubernetes.
+
 home: https://www.vaultproject.io
 icon: https://github.com/hashicorp/vault/raw/f22d202cde2018f9455dec755118a9b84586e082/Vault_PrimaryLogo_Black.png
 keywords: ["vault", "security", "encryption", "secrets", "management", "automation", "infrastructure"]

diff --git a/Makefile b/Makefile
@@ -4,6 +4,7 @@ CLOUDSDK_CORE_PROJECT?=vault-helm-dev-246514
 # set to run a single test - e.g acceptance/server-ha-enterprise-dr.bats
 ACCEPTANCE_TESTS?=acceptance
 
+
 # filter bats unit tests to run.
 UNIT_TESTS_FILTER?='.*'
 

diff --git a/test/unit/ui-service.bats b/test/unit/ui-service.bats
@@ -373,3 +373,4 @@ load _helpers
   [ "${actual}" = "null" ]
 
 }
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -373,3 +373,4 @@ load _helpers
		[ "${actual}" = "null" ]

		}