summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-01 00:57:49 +0100
committerGitHub <noreply@github.com>2020-12-01 00:57:49 +0100
commitca612a3407eeecfedc38b629731f1e7a0105020f (patch)
treeb1108f4b73a17dd8fbe860ca75e8f08734cf0999
parentc342583da09f47e22e8e1be7b1414ef38e6ef194 (diff)
parent12f835d125bda9c6971258d54e627b8b2acf859a (diff)
downloadpodman-ca612a3407eeecfedc38b629731f1e7a0105020f.tar.gz
podman-ca612a3407eeecfedc38b629731f1e7a0105020f.tar.bz2
podman-ca612a3407eeecfedc38b629731f1e7a0105020f.zip
Merge pull request #8523 from mheon/bump_30_dev
Bump master to v3.0.0-dev
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index ee8ce4d45..7886a483b 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -42,7 +42,7 @@ Epoch: 99
%else
Epoch: 0
%endif
-Version: 2.2.0
+Version: 3.0.0
Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
diff --git a/version/version.go b/version/version.go
index a62648eea..0bba0147b 100644
--- a/version/version.go
+++ b/version/version.go
@@ -8,9 +8,9 @@ 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.2.0-dev")
+var Version = semver.MustParse("3.0.0-dev")
// APIVersion is the version for the remote
// client API. It is used to determine compatibility
// between a remote podman client and its backend
-var APIVersion = semver.MustParse("2.1.0")
+var APIVersion = semver.MustParse("3.0.0")