From 9a614bb1c92820fcbfa1ceb5245433e42a8523a8 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Thu, 17 Sep 2020 14:23:07 -0400
Subject: [PATCH] Bump to v2.1.0-rc2

Signed-off-by: Matthew Heon <mheon@redhat.com>
---
 changelog.txt               | 33 +++++++++++++++++++++++++++++++++
 contrib/spec/podman.spec.in |  2 +-
 version/version.go          |  2 +-
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 3dadcb0b3e..b98e91d637 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,36 @@
+- Changelog for v2.1.0-rc2 (2020-09-17)
+  * Update release notes for Podman v2.1.0-RC2
+  * Fix play_kube_test deployment template
+  * fix missing completion in podman run
+  * Bump k8s.io/apimachinery from 0.19.1 to 0.19.2
+  * image list: return all associated names
+  * Add labels to a pod created via play kube
+  * Refactor remote pull to provide progress
+  * --mount: support arbitrary mount-argument order
+  * Fix podman pod create --infra-command and --infra-image
+  * Fix "rootless-cni-infra + runc fails with ENODEV"
+  * podman version and --version: fix format, exit
+  * Supports import&run--signature-policy
+  * Fix CI breakage due to PR collision
+  * [CI:DOCS]update owners file
+  * Refactor API version values
+  * Fix --systemd=always regression
+  * Correct HTTP methods for /containers/{id}/archive
+  * events endpoint: header: do not wait for events
+  * run/create: record raw image
+  * rootless CNI: extract env and cmd from image
+  * libpod: rootless CNI image: use quay
+  * move `rootless-cni-infra` image to quay.io
+  * vendor github.com/containers/image/v5@v5.6.0
+  * podman wait accept args > 1
+  * Usability: prevent "-l" with arguments
+  * Document the connection path for podman --remote
+  * Refactor API build endpoint to be more compliant
+  * pull types allow initial caps
+  * Determine if resolv.conf points to systemd-resolved
+  * Bump to v2.1.0-dev
+  * Fix completions for namespaces
+
 - Changelog for v2.1.0-rc1 (2020-09-11)
   * Add release notes for Podman v2.1.0-RC1
   * Vendor in containers/buildah 1.16.1
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 363aa60d7d..91aa58846d 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.1.0-rc2
 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 2e1335d2dc..2ac60e2966 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,7 +4,7 @@ package version
 // NOTE: remember to bump the version at the top
 // of the top-level README.md file when this is
 // bumped.
-const Version = "2.1.0-dev"
+const Version = "2.1.0-rc2"
 
 // APIVersion is the version for the remote
 // client API.  It is used to determine compatibility