aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt38
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--test/apiv2/01-basic.at2
-rw-r--r--version/version.go2
4 files changed, 41 insertions, 3 deletions
diff --git a/changelog.txt b/changelog.txt
index 74e630de4..bebd36502 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,41 @@
+- Changelog for v3.1.0 (2021-03-29):
+ * Fix test failure
+ * Update release notes for v3.1.0 final release
+ * [NO TESTS NEEDED] Turn on podman-remote build --isolation
+ * Fix long option format on docs.podman.io
+ * Fix containers list/prune http api filter behaviour
+ * [CI:DOCS] Add note to mappings for user/group userns in build
+ * Validate passed in timezone from tz option
+ * Generate Kubernetes PersistentVolumeClaims from named volumes
+ * libpod/image: unit tests: use a `registries.conf` for aliases
+ * libpod/image: unit tests: defer cleanup
+ * libpod/image: unit tests: use `require.NoError`
+ * Unification of until filter across list/prune endpoints
+ * Unification of label filter across list/prune endpoints
+ * fixup
+ * fix: build endpoint for compat API
+ * [NO TESTS NEEDED] Remove /tmp/containers-users-* files on reboot
+ * Check if stdin is a term in --interactive --tty mode
+ * [NO TESTS NEEDED] Fix rootless volume plugins
+ * Ensure manually-created volumes have correct ownership
+ * Support multi doc yaml for generate/play kube
+ * Correct json field name
+ * Fix filters in image http compat/libpod api endpoints
+ * podman generate systemd --new do not duplicate params
+ * Fix podman build --pull-never
+ * man pages: correct seccomp-policy label
+ * [NO TESTS NEEDED] Use same function podman-remote rmi as podman
+ * Add problematic volume name to kube play error messages
+ * Fix list pods filter handling in libpod api
+ * [NO TESTS NEEDED] Fix for kernel without CONFIG_USER_NS
+ * Remove resize race condition
+ * [NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
+ * Use TMPDIR when commiting images
+ * Add RequiresMountsFor= to systemd generate
+ * Fix swapped dimensions from terminal.GetSize
+ * Revert go-systemd to v2.22.0
+ * Cirrus: Update configuration for v3.1 branch
+
- Changelog for v3.1.0-rc2 (2021-03-23):
* Update release notes for v3.1.0-RC2
* Bump github.com/coreos/go-systemd/v22 from 22.1.0 to 22.3.0
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 5e820719f..9d871f719 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -42,7 +42,7 @@ Epoch: 99
%else
Epoch: 0
%endif
-Version: 3.1.0
+Version: 3.1.1
Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
diff --git a/test/apiv2/01-basic.at b/test/apiv2/01-basic.at
index 788007069..0bf0a0939 100644
--- a/test/apiv2/01-basic.at
+++ b/test/apiv2/01-basic.at
@@ -18,7 +18,7 @@ t HEAD libpod/_ping 200
for i in /version version; do
t GET $i 200 \
.Components[0].Name="Podman Engine" \
- .Components[0].Details.APIVersion=3.1.0-dev \
+ .Components[0].Details.APIVersion~3[0-9.-]\\+ \
.Components[0].Details.MinAPIVersion=3.0.0 \
.Components[0].Details.Os=linux \
.ApiVersion=1.40 \
diff --git a/version/version.go b/version/version.go
index 6b93ed8ea..c700b6f5c 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.0-dev")
+var Version = semver.MustParse("3.1.1-dev")
// See https://docs.docker.com/engine/api/v1.40/
// libpod compat handlers are expected to honor docker API versions