summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt19
-rw-r--r--version/version.go2
2 files changed, 20 insertions, 1 deletions
diff --git a/changelog.txt b/changelog.txt
index 8a401a967..c9fd4ea8d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,22 @@
+- Changelog for v2.0.0 (2020-06-19):
+ * Update release notes for v2.0.0
+ * Fixes #6670
+ * Correct logic for demux'ing channels
+ * Poll on events for file reading
+ * podman images --format json: pretty print
+ * CI: force registry:2.6
+ * Fix remote docs
+ * Allow recursive dependency start with Init()
+ * Bump k8s.io/apimachinery from 0.18.3 to 0.18.4
+ * unflake rmi tests
+ * Bump k8s.io/api from 0.18.3 to 0.18.4
+ * Bump go.etcd.io/bbolt from 1.3.4 to 1.3.5
+ * Podman system service is no longer experimental
+ * Handle dropping capabilties correctly when running as non root user
+ * Don't ignore --user flag in rootless --userns keepid
+ * Makefile: install.varlink needs to create dirs
+ * Do not share container log driver for exec
+
- Changelog for v2.0.0-rc7 (2020-06-17)
* Bump Buildah to v1.15.0
* Move logs functionality to separate file for APIv2
diff --git a/version/version.go b/version/version.go
index 4c7202e77..39d9aa7e0 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"
// APIVersion is the version for the remote
// client API. It is used to determine compatibility