summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt18
-rw-r--r--version/version.go2
2 files changed, 19 insertions, 1 deletions
diff --git a/changelog.txt b/changelog.txt
index 0ec721996..b4a19cb4f 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,21 @@
+- Changelog for v2.1.1 (2020-09-25):
+ * e2e tests: SkipIfRemote(): add a reason
+ * Examine all SkipIfRemote functions
+ * Update release notes for v2.1.1
+ * HTTP Attach: Wait until both STDIN and STDOUT finish
+ * Evict containers before removing via V2 API
+ * remote load: check if input is directory
+ * build: honor --runtime setting
+ * set interactive mode with compat create endpoint
+ * apiv2 container limit differ from docker-api
+ * Allow filtering on pod label values
+ * Remove final v2remotefail failures
+ * Fix a bug where log-driver json-file was made no logs
+ * add missing return for compat kill
+ * Include cgroup manager in `podman info` output
+ * Add Server header to API service responses
+ * podman save: fix redirect of multi-images
+
- Changelog for v2.1.0 (2020-09-22):
* Update release notes for v2.1.0 Final Release
* Fix up attach tests for podman remote
diff --git a/version/version.go b/version/version.go
index 7e9908f97..220fbe35b 100644
--- a/version/version.go
+++ b/version/version.go
@@ -8,7 +8,7 @@ import (
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
-var Version = semver.MustParse("2.1.1-dev")
+var Version = semver.MustParse("2.1.1")
// APIVersion is the version for the remote
// client API. It is used to determine compatibility