diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-24 17:40:46 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 17:40:46 +0000 |
| commit | 17db9851d05544ef49f8bce0deec452a99aae2a9 (patch) | |
| tree | f147005babb3a5bb2b3c4b1a44d9470524a9550a | |
| parent | c1a0b7d9d6a9a8e6afdae2392dc86a77f5e71676 (diff) | |
| parent | ca6fef1e1ce0304fe52d9348bc6ebf9d4d4207de (diff) | |
| download | podman-17db9851d05544ef49f8bce0deec452a99aae2a9.tar.gz podman-17db9851d05544ef49f8bce0deec452a99aae2a9.tar.bz2 podman-17db9851d05544ef49f8bce0deec452a99aae2a9.zip | |
Merge pull request #7732 from mheon/bump_211dev
Bump to v2.1.1-dev
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rw-r--r-- | contrib/spec/podman.spec.in | 2 | ||||
| -rw-r--r-- | version/version.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 6f32bf182..aef01689d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -14,7 +14,7 @@ env: #### Global variables used for all tasks #### # Name of the ultimate destination branch for this CI run, PR or post-merge. - DEST_BRANCH: "master" + DEST_BRANCH: "v2.1" # Overrides default location (/tmp/cirrus) for repo clone GOPATH: "/var/tmp/go" GOBIN: "${GOPATH}/bin" diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 363aa60d7..37cfe28fc 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.1.0 +Version: 2.1.1 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 0fbb22ff6..7e9908f97 100644 --- a/version/version.go +++ b/version/version.go @@ -8,7 +8,7 @@ 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.1.0") +var Version = semver.MustParse("2.1.1-dev") // APIVersion is the version for the remote // client API. It is used to determine compatibility |