Merge release 1.2.0 branch (#11513)

hashicorp · Nov 16, 2021 · 23c977c · 23c977c
1 parent fa1586c
commit 23c977c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.2.0 (Unreleased)
+## 1.2.0 (November 15, 2021)
 
 FEATURES:
 

diff --git a/GNUmakefile b/GNUmakefile
@@ -32,7 +32,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, but backport branches should point to the parent tag (e.g. 1.0.8 in release-1.0.9 after 1.1.0 is cut).
-LAST_RELEASE ?= v1.1.6
+LAST_RELEASE ?= v1.2.0
 
 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.0"
+	Version = "1.2.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