summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt11
-rw-r--r--version/version.go2
2 files changed, 12 insertions, 1 deletions
diff --git a/changelog.txt b/changelog.txt
index 6323fee9d..a68c5d6e5 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,14 @@
+- Changelog for HEAD (2021-04-21):
+ * Update release notes for v3.1.2
+ * Ensure mount destination is clean, no trailing slash
+ * Fixes podman-remote save to directories does not work
+ * [CI:DOCS] Add missing dash to verbose option
+ * [CI:DOCS] Fix Markdown table layout bugs
+ * [CI:DOCS] Rewrite --uidmap doc in podman-create.1.md and podman-run.1.md
+ * rmi: don't break when the image is missing a manifest
+ * Bump containers/image to v5.11.1
+ * Bump github.com/coreos/go-systemd from 22.2.0 to 22.3.1
+
- Changelog for HEAD (2021-04-16):
* Update release notes for v3.1.1
* podman play kube apply correct log driver
diff --git a/version/version.go b/version/version.go
index 1a167c150..accf6cb61 100644
--- a/version/version.go
+++ b/version/version.go
@@ -27,7 +27,7 @@ const (
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
-var Version = semver.MustParse("3.1.2-dev")
+var Version = semver.MustParse("3.1.2")
// See https://docs.docker.com/engine/api/v1.40/
// libpod compat handlers are expected to honor docker API versions