summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt9
-rw-r--r--version/version.go2
2 files changed, 10 insertions, 1 deletions
diff --git a/changelog.txt b/changelog.txt
index 9dd24a8c6..8610c0b78 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+- Changelog for v2.0.6 (2020-09-01):
+ * Update release notes for v2.0.6
+ * Ensure rootless containers without a passwd can start
+ * Preserve passwd on container restart
+ * Remove help/usage from --remote pre-check
+ * system tests: podman-remote, image tree
+ * Refactor parsing to not require --remote to be first
+ * Enable --remote flag
+
- Changelog for v2.0.6-rc1 (2020-08-28):
* Update release notes for v2.0.6
* Bump c/common to v0.14.10 and c/conmon to v2.0.20
diff --git a/version/version.go b/version/version.go
index 8dd18e100..a52f1a7ba 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.6-dev"
+const Version = "2.0.6"
// APIVersion is the version for the remote
// client API. It is used to determine compatibility