containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9795 from mheon/bump_320_dev 

Bump to v3.2.0-dev
This commit is contained in:
OpenShift Merge Robot 2021-03-29 20:42:03 +00:00 committed by GitHub
parent 2e9a46c729 637c5d55e1
commit b9e064ab84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/spec/podman.spec.in
View File

@ -42,7 +42,7 @@ Epoch: 99
%else %else
Epoch: 0 Epoch: 0
%endif %endif
Version: 3.1.0 Version: 3.2.0
Release: #COMMITDATE#.git%{shortcommit0}%{?dist} Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images Summary: Manage Pods, Containers and Container Images
License: ASL 2.0 License: ASL 2.0

4
test/apiv2/01-basic.at
View File

@ -18,8 +18,8 @@ t HEAD libpod/_ping 200
for i in /version version; do for i in /version version; do
t GET $i 200 \ t GET $i 200 \
.Components[0].Name="Podman Engine" \ .Components[0].Name="Podman Engine" \
.Components[0].Details.APIVersion=3.1.0-dev \ .Components[0].Details.APIVersion=3.2.0-dev \
.Components[0].Details.MinAPIVersion=3.0.0 \ .Components[0].Details.MinAPIVersion=3.1.0 \
.Components[0].Details.Os=linux \ .Components[0].Details.Os=linux \
.ApiVersion=1.40 \ .ApiVersion=1.40 \
.MinAPIVersion=1.24 \ .MinAPIVersion=1.24 \

4
version/version.go
View File

@ -27,7 +27,7 @@ const (
// NOTE: remember to bump the version at the top // NOTE: remember to bump the version at the top
// of the top-level README.md file when this is // of the top-level README.md file when this is
// bumped. // bumped.
var Version = semver.MustParse("3.1.0-dev") var Version = semver.MustParse("3.2.0-dev")
// See https://docs.docker.com/engine/api/v1.40/ // See https://docs.docker.com/engine/api/v1.40/
// libpod compat handlers are expected to honor docker API versions // libpod compat handlers are expected to honor docker API versions
@ -38,7 +38,7 @@ var Version = semver.MustParse("3.1.0-dev")
var APIVersion = map[Tree]map[Level]semver.Version{ var APIVersion = map[Tree]map[Level]semver.Version{
Libpod: { Libpod: {
CurrentAPI: Version, CurrentAPI: Version,
MinimalAPI: semver.MustParse("3.0.0"), MinimalAPI: semver.MustParse("3.1.0"),
}, },
Compat: { Compat: {
CurrentAPI: semver.MustParse("1.40.0"), CurrentAPI: semver.MustParse("1.40.0"),