From e74e84aa0637033c821955d817fca85f56a90d85 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Mon, 15 Jun 2020 09:59:31 -0400
Subject: Bump to v2.0.0-rc6

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

diff --git a/changelog.txt b/changelog.txt
index f17e0ee75..951c01c80 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,47 @@
+- Changelog for v2.0.0-rc6 (2020-06-15)
+  * Change Varlink systemd unit to use `system service`
+  * Turn on More linters
+  * Do not default WorkingDir to / on client side
+  * Reassemble filters on the server side
+  * Bump github.com/containers/common from 0.13.0 to 0.13.1
+  * [CI:DOCS] Fix carriage returns in API v2 header
+  * Fix missing code during in_podman build
+  * update document login see config.json as valid
+  * [CI:DOCS] Add quick start directions to APIv2 Dock
+  * Fix builds for RDO
+  * podman: create scope only if --cgroup-manager=systemd
+  * libpod: fix check for slirp4netns netns
+  * e2e: sanity check --infra-conmon-pidfile
+  * generate systemd: wrap pod/ctr lookup errors
+  * docs: create/run fix --pod-id-file description
+  * generate systemd: create pod template
+  * generate systemd: refactor
+  * add (*Pod).CreateCommand()
+  * generate systemd: rename source files
+  * generate systemd: rephrase lookup error
+  * pod create: add `--infra-conmon-pidfile`
+  * generate systemd: rename "cid" to "ctr-id"
+  * container-{create,run}: add `--pod-id-file`
+  * podman-pod{rm,start,stop}: support --pod-id-file
+  * systemd/generate: remove unused infra container field
+  * pod config: add a `CreateCommand` field
+  * Fixed bug where 'podman log <container>' would truncate some lines.
+  * Enable IPv6 port binding
+  * Bump to v2.0.0-dev
+  * container: do not set hostname when joining uts
+  * container: make resolv.conf and hosts accessible in userns
+  * WIP: Enable (and disable) remote testing
+  * fix api fails with 'strconv.ParseUint: parsing "tcp": invalid syntax'
+  * Fix play kube report printing when no containers are created
+  * Fix missing doc for field in PlayKubePod
+  * Update comment related to seccomp profiles in play kube
+  * Consistent Yaml convention througout play kube tests
+  * Fix podman generate tests that relied on play kube
+  * Add tests for Deployment Kind and minor fix for play kube output
+  * Fix existing tests
+  * Modify PlayKubeReport to preserve pod->container mapping
+  * supporting k8s Deployment objects
+
 - Changelog for v2.0.0-rc5 (2020-06-10)
   * Fix Id->ID where possible for lint
   * Fixup issues found by golint
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 260de7b20..9de3d17f3 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.0.0
+Version: 2.0.0-rc6
 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 4c7202e77..2be87a786 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.0.0-dev"
+const Version = "2.0.0-rc6"
 
 // APIVersion is the version for the remote
 // client API.  It is used to determine compatibility
-- 
cgit v1.2.3-54-g00ecf


From c3c2faf3da11dd46f35b6f60acb992eba9ac3ec5 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Mon, 15 Jun 2020 09:59:34 -0400
Subject: Bump to v2.0.0-dev

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

diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 9de3d17f3..260de7b20 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.0.0-rc6
+Version: 2.0.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 2be87a786..4c7202e77 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.0.0-rc6"
+const Version = "2.0.0-dev"
 
 // APIVersion is the version for the remote
 // client API.  It is used to determine compatibility
-- 
cgit v1.2.3-54-g00ecf