summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-03-23 14:00:57 -0400
committerGitHub <noreply@github.com>2018-03-23 14:00:57 -0400
commit684eb8fbfc384906dee304f88fdb6f1a3c637620 (patch)
treedda08d8fca3705c81af8fd28f2775c1d87e12eec
parent3f5da4d0dd04f755f9a46f93d59f2db58285436b (diff)
parent6a0282a609e712d34848130a3ad343c1668a787e (diff)
downloadpodman-684eb8fbfc384906dee304f88fdb6f1a3c637620.tar.gz
podman-684eb8fbfc384906dee304f88fdb6f1a3c637620.tar.bz2
podman-684eb8fbfc384906dee304f88fdb6f1a3c637620.zip
Merge pull request #542 from mheon/bump_0_3_4
Bump to v0.3.4
-rw-r--r--Makefile2
-rw-r--r--changelog.txt18
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 21 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 97238c849..78e69b624 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
GO ?= go
-EPOCH_TEST_COMMIT ?= c08a1e0b11
+EPOCH_TEST_COMMIT ?= 3f5da4d0dd
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index e69de29bb..a218766d0 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -0,0 +1,18 @@
+- Changelog for v0.3.4 (2018-03-23):
+ * Bump version to v0.3.4
+ * Make container env variable conditional
+ * Stage 4 Image cleanup
+ * Add CONTAINER environment variable
+ * Small manpage reword
+ * Document .containerenv in manpages. Move it to /run.
+ * Add .containerenv file
+ * Add script to determine dependency sizes
+ * If cidfile exists, do not proceed
+ * Removing tagged images change in behavior
+ * Use podman to test podman on FAH
+ * Migrate podman inspect and tag to image library
+ * Migrate podman images to image library
+ * Makefile: add changelog target
+ * Image library stage 4 - create and commit
+ * Add 'podman restart' asciinema
+ * Fix Travis tests for sig-proxy
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index e0efab9b5..f6fffee89 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.4
+Version: 0.3.5
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 710464969..c1a075fc5 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.4-dev"
+const Version = "0.3.5-dev"