backport of commit 3c8eb54

hashicorp · Oct 27, 2023 · 0dcd6f8 · 0dcd6f8
1 parent e8efe2d
commit 0dcd6f8
Show file tree

Hide file tree

Showing 4,037 changed files with 32,419 additions and 95,040 deletions.
diff --git a/.changelog/11041.txt b/.changelog/11041.txt
diff --git a/.changelog/11572.txt b/.changelog/11572.txt
@@ -1,5 +1,5 @@
 ```release-note:breaking-change
-raft: The default raft protocol version is now 3 so you must follow the [Upgrading to Raft Protocol 3](https://developer.hashicorp.com/nomad/docs/upgrade#upgrading-to-raft-protocol-3) guide when upgrading an existing cluster to Nomad 1.3.0. Downgrading the raft protocol version is not supported.
+raft: The default raft protocol version is now 3 so you must follow the [Upgrading to Raft Protocol 3](https://www.nomadproject.io/docs/upgrade#upgrading-to-raft-protocol-3) guide when upgrading an existing cluster to Nomad 1.3.0. Downgrading the raft protocol version is not supported.
 ```
 
 ```release-note:improvement

diff --git a/.changelog/13343.txt b/.changelog/13343.txt
diff --git a/.changelog/16099.txt b/.changelog/16099.txt
diff --git a/.changelog/16134.txt b/.changelog/16134.txt
diff --git a/.changelog/16221.txt b/.changelog/16221.txt
diff --git a/.changelog/16228.txt b/.changelog/16228.txt
diff --git a/.changelog/16243.txt b/.changelog/16243.txt
diff --git a/.changelog/16463.txt b/.changelog/16463.txt
diff --git a/.changelog/16743.txt b/.changelog/16743.txt
diff --git a/.changelog/16745.txt b/.changelog/16745.txt
diff --git a/.changelog/16763.txt b/.changelog/16763.txt
diff --git a/.changelog/16872.txt b/.changelog/16872.txt
diff --git a/.changelog/16908.txt b/.changelog/16908.txt
diff --git a/.changelog/16932.txt b/.changelog/16932.txt
diff --git a/.changelog/17010.txt b/.changelog/17010.txt
diff --git a/.changelog/17017.txt b/.changelog/17017.txt
diff --git a/.changelog/17041.txt b/.changelog/17041.txt
diff --git a/.changelog/17044.txt b/.changelog/17044.txt
diff --git a/.changelog/17045.txt b/.changelog/17045.txt
diff --git a/.changelog/17065.txt b/.changelog/17065.txt
diff --git a/.changelog/17074.txt b/.changelog/17074.txt
diff --git a/.changelog/17084.txt b/.changelog/17084.txt
diff --git a/.changelog/17138.txt b/.changelog/17138.txt
diff --git a/.changelog/17196.txt b/.changelog/17196.txt
diff --git a/.changelog/17214.txt b/.changelog/17214.txt
diff --git a/.changelog/17309.txt b/.changelog/17309.txt
diff --git a/.changelog/17334.txt b/.changelog/17334.txt
diff --git a/.changelog/17341.txt b/.changelog/17341.txt
diff --git a/.changelog/17343.txt b/.changelog/17343.txt
diff --git a/.changelog/17345.txt b/.changelog/17345.txt
diff --git a/.changelog/17354.txt b/.changelog/17354.txt
diff --git a/.changelog/17383.txt b/.changelog/17383.txt
diff --git a/.changelog/17421.txt b/.changelog/17421.txt
diff --git a/.changelog/17576.txt b/.changelog/17576.txt
diff --git a/.changelog/17579.txt b/.changelog/17579.txt
diff --git a/.changelog/17645.txt b/.changelog/17645.txt
diff --git a/.changelog/17647.txt b/.changelog/17647.txt
diff --git a/.changelog/17652.txt b/.changelog/17652.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+scheduler: Fixed a bug that could cause replacements for failed allocations to be placed in the wrong datacenter during a canary deployment
+```
diff --git a/.changelog/17752.txt b/.changelog/17752.txt
diff --git a/.changelog/17754.txt b/.changelog/17754.txt
diff --git a/.changelog/17770.txt b/.changelog/17770.txt
diff --git a/.changelog/17783.txt b/.changelog/17783.txt
diff --git a/.changelog/17843.txt b/.changelog/17843.txt
diff --git a/.changelog/17858.txt b/.changelog/17858.txt
diff --git a/.changelog/17911.txt b/.changelog/17911.txt
diff --git a/.changelog/17915.txt b/.changelog/17915.txt
diff --git a/.changelog/17932.txt b/.changelog/17932.txt
diff --git a/.changelog/17933.txt b/.changelog/17933.txt
diff --git a/.changelog/17935.txt b/.changelog/17935.txt
diff --git a/.changelog/17938.txt b/.changelog/17938.txt
diff --git a/.changelog/17939.txt b/.changelog/17939.txt
diff --git a/.changelog/17964.txt b/.changelog/17964.txt
diff --git a/.changelog/18017.txt b/.changelog/18017.txt
diff --git a/.changelog/18021.txt b/.changelog/18021.txt
diff --git a/.changelog/18051.txt b/.changelog/18051.txt
diff --git a/.changelog/18053.txt b/.changelog/18053.txt
diff --git a/.changelog/18054.txt b/.changelog/18054.txt
diff --git a/.changelog/18069.txt b/.changelog/18069.txt
diff --git a/.changelog/18070.txt b/.changelog/18070.txt
diff --git a/.changelog/18085.txt b/.changelog/18085.txt
diff --git a/.changelog/18095.txt b/.changelog/18095.txt
diff --git a/.changelog/18120.txt b/.changelog/18120.txt
diff --git a/.changelog/18146.txt b/.changelog/18146.txt
diff --git a/.changelog/18198.txt b/.changelog/18198.txt
diff --git a/.changelog/18210.txt b/.changelog/18210.txt
diff --git a/.changelog/18318.txt b/.changelog/18318.txt
diff --git a/.changelog/18359.txt b/.changelog/18359.txt
diff --git a/.changelog/18366.txt b/.changelog/18366.txt
diff --git a/.changelog/18371.txt b/.changelog/18371.txt
diff --git a/.changelog/18426.txt b/.changelog/18426.txt
diff --git a/.changelog/18444.txt b/.changelog/18444.txt
diff --git a/.changelog/18463.txt b/.changelog/18463.txt
diff --git a/.changelog/18494.txt b/.changelog/18494.txt
diff --git a/.changelog/18520.txt b/.changelog/18520.txt
diff --git a/.changelog/18524.txt b/.changelog/18524.txt
diff --git a/.changelog/18553.txt b/.changelog/18553.txt
diff --git a/.changelog/18570.txt b/.changelog/18570.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+csi: check controller plugin health early during volume register/create
+```
diff --git a/.changelog/18595.txt b/.changelog/18595.txt
diff --git a/.changelog/18598.txt b/.changelog/18598.txt
diff --git a/.changelog/18604.txt b/.changelog/18604.txt
diff --git a/.changelog/18621.txt b/.changelog/18621.txt
diff --git a/.changelog/18681.txt b/.changelog/18681.txt
diff --git a/.changelog/18768.txt b/.changelog/18768.txt
diff --git a/.changelog/18794.txt b/.changelog/18794.txt
diff --git a/.changelog/18795.txt b/.changelog/18795.txt
diff --git a/.changelog/18832.txt b/.changelog/18832.txt
diff --git a/.changelog/18836.txt b/.changelog/18836.txt
diff --git a/.changelog/18843.txt b/.changelog/18843.txt
diff --git a/.copywrite.hcl b/.copywrite.hcl
@@ -1,16 +1,11 @@
 # Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
+# SPDX-License-Identifier: MPL-2.0
 
 schema_version = 1
 
 project {
   header_ignore = [
     "command/asset/*.hcl",
     "command/agent/bindata_assetfs.go",
-    "ui/node_modules",
-
-    // Enterprise files do not fall under the open source licensing. OSS-ENT
-    // merge conflicts might happen here, please be sure to put new OSS
-    // exceptions above this comment.
   ]
 }
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,5 +1,2 @@
 # This commit just fixes some typos and isn't useful
 b0a20b4dc965a38b0c843f47c16685ccad7439da
-
-# giant copywrite headers commit
-f005448366ed3e796a2f22696d8c063dff4677f8