backport of commit a362862

hashicorp · Mar 31, 2023 · 9675cff · 9675cff
1 parent cc23b0e
commit 9675cff
Show file tree

Hide file tree

Showing 7,685 changed files with 66,446 additions and 163,384 deletions.
diff --git a/.changelog/14132.txt b/.changelog/14132.txt
diff --git a/.changelog/14244.txt b/.changelog/14244.txt
diff --git a/.changelog/14437.txt b/.changelog/14437.txt
diff --git a/.changelog/14465.txt b/.changelog/14465.txt
diff --git a/.changelog/14832.txt b/.changelog/14832.txt
diff --git a/.changelog/14833.txt b/.changelog/14833.txt
diff --git a/.changelog/14956.txt b/.changelog/14956.txt
diff --git a/.changelog/15001.txt b/.changelog/15001.txt
diff --git a/.changelog/15107.txt b/.changelog/15107.txt
diff --git a/.changelog/15253.txt b/.changelog/15253.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
-connect: Fixed issue where using Vault 1.11+ as CA provider would eventually break Intermediate CAs in primary datacenters. A separate fix is needed to address the same issue in secondary datacenters. [[GH-15217](https://github.com/hashicorp/consul/issues/15217)]
+connect: Fixed issue where using Vault 1.11+ as CA provider would eventually break Intermediate CAs [[GH-15217](https://github.com/hashicorp/consul/issues/15217)]
 ```
diff --git a/.changelog/15274.txt b/.changelog/15274.txt
diff --git a/.changelog/15297.txt b/.changelog/15297.txt
diff --git a/.changelog/15598.txt b/.changelog/15598.txt
diff --git a/.changelog/15614.txt b/.changelog/15614.txt
diff --git a/.changelog/15710.txt b/.changelog/15710.txt
diff --git a/.changelog/15794.txt b/.changelog/15794.txt
diff --git a/.changelog/15817.txt b/.changelog/15817.txt
diff --git a/.changelog/15818.txt b/.changelog/15818.txt
diff --git a/.changelog/15828.txt b/.changelog/15828.txt
diff --git a/.changelog/15864.txt b/.changelog/15864.txt
diff --git a/.changelog/15884.txt b/.changelog/15884.txt
diff --git a/.changelog/15892.txt b/.changelog/15892.txt
diff --git a/.changelog/15906.txt b/.changelog/15906.txt
diff --git a/.changelog/15922.txt b/.changelog/15922.txt
diff --git a/.changelog/15947.txt b/.changelog/15947.txt
diff --git a/.changelog/15956.txt b/.changelog/15956.txt
diff --git a/.changelog/15967.txt b/.changelog/15967.txt
diff --git a/.changelog/15970.txt b/.changelog/15970.txt
diff --git a/.changelog/16009.txt b/.changelog/16009.txt
diff --git a/.changelog/16044.txt b/.changelog/16044.txt
diff --git a/.changelog/16097.txt b/.changelog/16097.txt
diff --git a/.changelog/16105.txt b/.changelog/16105.txt
diff --git a/.changelog/16176.txt b/.changelog/16176.txt
diff --git a/.changelog/16204.txt b/.changelog/16204.txt
diff --git a/.changelog/16205.txt b/.changelog/16205.txt
diff --git a/.changelog/16224.txt b/.changelog/16224.txt
diff --git a/.changelog/16227.txt b/.changelog/16227.txt
diff --git a/.changelog/16251.txt b/.changelog/16251.txt
diff --git a/.changelog/16259.txt b/.changelog/16259.txt
diff --git a/.changelog/16262.txt b/.changelog/16262.txt
diff --git a/.changelog/16266.txt b/.changelog/16266.txt
diff --git a/.changelog/16274.txt b/.changelog/16274.txt
diff --git a/.changelog/16284.txt b/.changelog/16284.txt
diff --git a/.changelog/16288.txt b/.changelog/16288.txt
diff --git a/.changelog/16292.txt b/.changelog/16292.txt
diff --git a/.changelog/16298.txt b/.changelog/16298.txt
diff --git a/.changelog/16301.txt b/.changelog/16301.txt
diff --git a/.changelog/16369.txt b/.changelog/16369.txt
diff --git a/.changelog/16412.txt b/.changelog/16412.txt
diff --git a/.changelog/16428.txt b/.changelog/16428.txt
diff --git a/.changelog/16444.txt b/.changelog/16444.txt
diff --git a/.changelog/16445.txt b/.changelog/16445.txt
diff --git a/.changelog/16485.txt b/.changelog/16485.txt
diff --git a/.changelog/16497.txt b/.changelog/16497.txt
diff --git a/.changelog/16506.txt b/.changelog/16506.txt
diff --git a/.changelog/16508.txt b/.changelog/16508.txt
diff --git a/.changelog/16512.txt b/.changelog/16512.txt
diff --git a/.changelog/16519.txt b/.changelog/16519.txt
diff --git a/.changelog/16530.txt b/.changelog/16530.txt
diff --git a/.changelog/16531.txt b/.changelog/16531.txt
diff --git a/.changelog/16574.txt b/.changelog/16574.txt
diff --git a/.changelog/16577.txt b/.changelog/16577.txt
diff --git a/.changelog/16585.txt b/.changelog/16585.txt
diff --git a/.changelog/16647.txt b/.changelog/16647.txt
diff --git a/.changelog/16649.txt b/.changelog/16649.txt
diff --git a/.changelog/16661.txt b/.changelog/16661.txt
diff --git a/.changelog/16673.txt → .changelog/16693.txt b/.changelog/16673.txt → .changelog/16693.txt
@@ -1,3 +1,3 @@
 ```release-note:bug
 peering: Fixes a bug where the importing partition was not added to peered failover targets, which causes issues when the importing partition is a non-default partition.
-```
+```
diff --git a/.changelog/16781.txt b/.changelog/16781.txt
diff --git a/.changelog/16789.txt b/.changelog/16789.txt
diff --git a/.changelog/_16677.txt b/.changelog/_16677.txt
diff --git a/.changelog/_4734.txt b/.changelog/_4734.txt
diff --git a/.changelog/_4821.txt b/.changelog/_4821.txt
diff --git a/.circleci/bash_env.sh b/.circleci/bash_env.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
 
 export GIT_COMMIT=$(git rev-parse --short HEAD)
 export GIT_COMMIT_YEAR=$(git show -s --format=%cd --date=format:%Y HEAD)