Merge branch 'release/1.4.1' into release/1.4.x

hashicorp · Oct 6, 2022 · 930f41f · 930f41f
2 parents ddb081c + 57a2f60
commit 930f41f
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.4.1 (October 06, 2022)
+
+BUG FIXES:
+
+* keyring: Fixed a panic that can occur during upgrades to 1.4.0 when initializing the keyring [[GH-14821](https://github.com/hashicorp/nomad/issues/14821)]
+
 ## 1.4.0 (October 04, 2022)
 
 FEATURES:

diff --git a/GNUmakefile b/GNUmakefile
@@ -49,7 +49,7 @@ PROTO_COMPARE_TAG ?= v1.0.3$(if $(findstring ent,$(GO_TAGS)),+ent,)
 
 # LAST_RELEASE is the git sha of the latest release corresponding to this branch. main should have the latest
 # published release, and release branches should point to the latest published release in the X.Y release line.
-LAST_RELEASE ?= v1.4.0
+LAST_RELEASE ?= v1.4.1
 
 default: help
 

diff --git a/command/agent/bindata_assetfs.go b/command/agent/bindata_assetfs.go
diff --git a/version/version.go b/version/version.go
@@ -11,7 +11,7 @@ var (
 	GitDescribe string
 
 	// The main version number that is being run at the moment.
-	Version = "1.4.1"
+	Version = "1.4.2"
 
 	// A pre-release marker for the version. If this is "" (empty string)
 	// then it means that it is a final release. Otherwise, this is a pre-release