diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-29 20:42:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 20:42:03 +0000 |
| commit | b9e064ab84044f3db25e48384a1bd6fe5dc6ecdc (patch) | |
| tree | 63b00324fd576b55f12a440356335eafbff7f5ec | |
| parent | 2e9a46c72967405808f88c4590d3fab970fed4dd (diff) | |
| parent | 637c5d55e181146a5e3e086485a45190af80977f (diff) | |
| download | podman-b9e064ab84044f3db25e48384a1bd6fe5dc6ecdc.tar.gz podman-b9e064ab84044f3db25e48384a1bd6fe5dc6ecdc.tar.bz2 podman-b9e064ab84044f3db25e48384a1bd6fe5dc6ecdc.zip | |
Merge pull request #9795 from mheon/bump_320_dev
Bump to v3.2.0-dev
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rw-r--r-- | test/apiv2/01-basic.at | 4 | ||||
| -rw-r--r-- | version/version.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 5e820719f..78ff664f7 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.2.0 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..a256d8327 100644 --- a/test/apiv2/01-basic.at +++ b/test/apiv2/01-basic.at @@ -18,8 +18,8 @@ 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.MinAPIVersion=3.0.0 \ + .Components[0].Details.APIVersion=3.2.0-dev \ + .Components[0].Details.MinAPIVersion=3.1.0 \ .Components[0].Details.Os=linux \ .ApiVersion=1.40 \ .MinAPIVersion=1.24 \ diff --git a/version/version.go b/version/version.go index 6b93ed8ea..1cbd9e309 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.2.0-dev") // See https://docs.docker.com/engine/api/v1.40/ // 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{ Libpod: { CurrentAPI: Version, - MinimalAPI: semver.MustParse("3.0.0"), + MinimalAPI: semver.MustParse("3.1.0"), }, Compat: { CurrentAPI: semver.MustParse("1.40.0"), |