Merge branch 'release/1.5.5' into release/1.5.x

hashicorp · May 5, 2023 · 3ff9f66 · 3ff9f66
2 parents 9045542 + e72da82
commit 3ff9f66
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 43 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.5.5 (May 05, 2023)
+
+BUG FIXES:
+
+* logging: Fixed a bug where alloc logs would not be collected after an upgrade to 1.5.4 [[GH-17087](https://github.com/hashicorp/nomad/issues/17087)]
+
 ## 1.5.4 (May 02, 2023)
 
 BREAKING CHANGES:

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.5.4
+LAST_RELEASE ?= v1.5.5
 
 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
@@ -16,7 +16,7 @@ var (
 	GitDescribe string
 
 	// The main version number that is being run at the moment.
-	Version = "1.5.5"
+	Version = "1.5.6"
 
 	// 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