summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-03-09 10:09:46 -0500
committerGitHub <noreply@github.com>2018-03-09 10:09:46 -0500
commitc1d00ff329be91bd6f5e97ea904e31d1fb8267ad (patch)
treeb77ea366d6a311f9e8e5e3f7934048884299c5ef
parent7516dfd8c5185346c49ab899f41c080547c3d107 (diff)
parent80723e4b9b8bea5bc2c193d496a23a9045b192e1 (diff)
downloadpodman-c1d00ff329be91bd6f5e97ea904e31d1fb8267ad.tar.gz
podman-c1d00ff329be91bd6f5e97ea904e31d1fb8267ad.tar.bz2
podman-c1d00ff329be91bd6f5e97ea904e31d1fb8267ad.zip
Merge pull request #470 from mheon/bump_3_2
Bump to v0.3.2 and again to v0.3.3-dev
-rw-r--r--Makefile2
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
3 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 85a65e3a0..fccae08d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
GO ?= go
-EPOCH_TEST_COMMIT ?= bd7de5d5dd
+EPOCH_TEST_COMMIT ?= 7516dfd8c5
HEAD ?= HEAD
PROJECT := github.com/projectatomic/libpod
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 662f87957..5589c2e8a 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -44,7 +44,7 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: podman
-Version: 0.3.2
+Version: 0.3.3
Release: git%{shortcommit}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
diff --git a/version/version.go b/version/version.go
index 113af2c77..990892f5a 100644
--- a/version/version.go
+++ b/version/version.go
@@ -1,4 +1,4 @@
package version
// Version is the version of the build.
-const Version = "0.3.2-dev"
+const Version = "0.3.3-dev"