Merge pull request #7728 from mheon/bump-2.1.0

[CI:DOCS] Bump to v2.1.0

3 files changed, 31 insertions, 2 deletions

diff --git a/changelog.txt b/changelog.txt
index b98e91d63..0ec721996 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,32 @@
+- Changelog for v2.1.0 (2020-09-22):
+  * Update release notes for v2.1.0 Final Release
+  * Fix up attach tests for podman remote
+  * update stale bot
+  * [CI:DOCS] Add 'In Progress' note to CONTRIBUTING.md
+  * Restore 'id' stanza in pull results
+  * Fix podman image unmount to only report images unmounted
+  * libpod: bumps up rootless-cni-infra to 2
+  * stats: log errors instead of sending 500
+  * Fix incorrect parsing of create/run --volumes-from
+  * rootless-cni-infra: fix flakiness during bringing up lo interface
+  * Fix handling of podman-remote stop --ignore
+  * Refactor version handling in cmd tree
+  * Preserve groups in exec sessions in ctrs with --user
+  * Install bats as root
+  * Makefile: Fix broken libpodimage targets
+  * stats: detect closed client connection
+  * stats endpoint: write OK header once
+  * handle the play kube and generate kube for with restartPolicy
+  * fix the .Path and .Args when use the infra-command
+  * Update nix pin with `make nixpkgs`
+  * fix a typo of login.1.md
+  * Bump github.com/rootless-containers/rootlesskit from 0.10.0 to 0.10.1
+  * enable --iidfile for podman-remote build
+  * update github.com/docker/docker and relevant deps
+  * Make Go builds more consistent
+  * dependabot-dance: new tool for managing revendor PRs
+  * WIP: Fix remote logs
+
 - Changelog for v2.1.0-rc2 (2020-09-17)
   * Update release notes for Podman v2.1.0-RC2
   * Fix play_kube_test deployment template
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 363aa60d7..2e266b59f 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -42,7 +42,7 @@ Epoch: 99
 %else
 Epoch: 0
 %endif
-Version: 2.1.0
+Version: 2.2.0
 Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
diff --git a/version/version.go b/version/version.go
index df2e4f2ba..e6b1425ef 100644
--- a/version/version.go
+++ b/version/version.go
@@ -8,7 +8,7 @@ import (
 // NOTE: remember to bump the version at the top
 // of the top-level README.md file when this is
 // bumped.
-var Version = semver.MustParse("2.1.0-dev")
+var Version = semver.MustParse("2.2.0-dev")
 
 // APIVersion is the version for the remote
 // client API.  It is used to determine compatibility