Merge pull request #11570 from hashicorp/merge-release-1.2.2-branch

Merge release 1.2.2 branch
This commit is contained in:
Luiz Aoqui
2021-11-24 15:34:12 -05:00
committed by GitHub
5 changed files with 9 additions and 183089 deletions

View File

@@ -1,3 +1,9 @@
## 1.2.2 (November 24, 2021)
BUG FIXES:
* scheduler: Fix panic when system jobs are filtered by node class [[GH-11565](https://github.com/hashicorp/nomad/issues/11565)]
## 1.2.1 (November 19, 2021)
SECURITY:

View File

@@ -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.2.1
LAST_RELEASE ?= v1.2.2
default: help

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -11,12 +11,12 @@ var (
GitDescribe string
// The main version number that is being run at the moment.
Version = "1.2.1"
Version = "1.2.3"
// 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
// such as "dev" (in development), "beta", "rc1", etc.
VersionPrerelease = ""
VersionPrerelease = "dev"
// VersionMetadata is metadata further describing the build type.
VersionMetadata = ""