Skip to content

Commit

Permalink
Merge pull request #10801 from hashicorp/merge-release-1.1.2
Browse files Browse the repository at this point in the history
Prepare for 1.1.3 development
  • Loading branch information
Mahmood Ali committed Jun 22, 2021
2 parents 41319b0 + 1bf9e7c commit 6d2b704
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
## 1.1.2 (Unreleased)
## 1.1.3 (Unreleased)

## 1.1.2 (June 22, 2021)

IMPROVEMENTS:
* cli: Added `-monitor` flag to `deployment status` command and automatically monitor deployments from `job run` command. [[GH-10661](https://github.com/hashicorp/nomad/pull/10661)]
Expand Down Expand Up @@ -128,7 +130,7 @@ BUG FIXES:
* server: Fixed a panic that may arise on submission of jobs containing invalid service checks [[GH-10154](https://github.com/hashicorp/nomad/issues/10154)]
* ui: Fixed the rendering of interstitial components shown after processing a dynamic application sizing recommendation. [[GH-10094](https://github.com/hashicorp/nomad/pull/10094)]

## 1.0.8 (Unreleased)
## 1.0.8 (June 22, 2021)

BUG FIXES:
* artifact: Fixed support for 5 part vhosted-style AWS S3 buckets. [[GH-10778](https://github.com/hashicorp/nomad/issues/10778)]
Expand Down
2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var (
GitDescribe string

// The main version number that is being run at the moment.
Version = "1.1.2"
Version = "1.1.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
Expand Down

0 comments on commit 6d2b704

Please sign in to comment.