Merge branch 'release/1.2.14' into release/1.2.x

hashicorp · Oct 27, 2022 · 6afb2b5 · 6afb2b5
2 parents 1adb881 + 5eee504
commit 6afb2b5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 1.2.14 (October 26, 2022)
+
+IMPROVEMENTS:
+
+* deps: update go-memdb for goroutine leak fix [[GH-14983](https://github.com/hashicorp/nomad/issues/14983)]
+
+BUG FIXES:
+
+* acl: Fixed a bug where Nomad version checking for one-time tokens was enforced across regions [[GH-14910](https://github.com/hashicorp/nomad/issues/14910)]
+* deps: Update hashicorp/raft to v1.3.11; fixes unstable leadership on server removal [[GH-15021](https://github.com/hashicorp/nomad/issues/15021)]
+
 ## 1.2.13 (October 04, 2022)
 
 SECURITY:

diff --git a/GNUmakefile b/GNUmakefile
@@ -43,7 +43,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.2.13
+LAST_RELEASE ?= v1.2.14
 
 default: help
 

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.2.14"
+	Version = "1.2.15"
 
 	// 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