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

hashicorp · Mar 2, 2023 · c503df1 · c503df1
2 parents c8848c1 + c922b97
commit c503df1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.5.0 (Unreleased)
+## 1.5.0 (March 01, 2023)
 
 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.3
+LAST_RELEASE ?= v1.5.0
 
 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.0"
+	Version = "1.5.1"
 
 	// 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