Merge pull request #7174 from mheon/bump_204

[CI:DOCS] Bump to v2.0.4

3 files changed, 25 insertions, 2 deletions

diff --git a/changelog.txt b/changelog.txt
index 51161c020..b44dfffcb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,26 @@
+- Changelog for v2.0.4 (2020-07-31):
+  * Update release notes for v2.0.4
+  * Disable a nonfunctional build test
+  * volumes: do not recurse when chowning
+  * add {{.RunningFor}} placeholder in ps --format
+  * fix swapped mem_usage/percent fields
+  * Ensure that 'rmi --force' evicts Podman containers
+  * Don't crash when giving bogus format commands
+  * Binding the same container port to >1 host port is OK
+  * Specifying --ipc=host --pid=host is broken
+  * add newline to output in error message
+  * When chowning we should not follow symbolic link
+  * replace the html/template package with text/template
+  * The `podman start --attach` command should not print ID
+  * Fix exit code example in podman-run.1.md
+  * Switch references from libpod.conf to containers.conf
+  * Bump github.com/rootless-containers/rootlesskit from 0.9.5 to 0.10.0
+  * compat/info.go: TrimPrefix(CGroupsVersion, "v")
+  * Fix building from http or '-' options
+  * Fix `podman image search` missing description
+  * test/apiv2: add a simple events test
+  * API events: fix parsing error
+
 - Changelog for v2.0.3 (2020-07-23):
   * Drop a nonfunctional test in test/apiv2
   * Update release notes for v2.0.3
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index cc3eb63a4..787309f09 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.4
+Version: 2.0.5
 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 8346afcde..2a4816277 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.4-dev"
+const Version = "2.0.5-dev"
 
 // APIVersion is the version for the remote
 // client API.  It is used to determine compatibility