Merge pull request #595 from mheon/bump_0_4_1

Bump to v0.4.1

4 files changed, 29 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 92ede9703..5a897e42c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= 1e59053cc5
+EPOCH_TEST_COMMIT ?= 54bd0ae716
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 2f829d9f5..57a767f82 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,29 @@
+- Changelog for HEAD (2018-04-05):
+  * Remove image via storage if a buildah container is associated
+  * Add hooks support to podman
+  * Run images with no names
+  * Prevent a potential race when stopping containers
+  * Only allocate tty when -t
+  * Stopping a stopped container should not be an error
+  * Add conmon-pidfile flag to bash completions/manpages
+  * --entrypoint= should delete existing entrypoint
+  * Fix golint
+  * Remove explicit Init() calls in run and start
+  * Refactor dependency checks from init() into public API
+  * Do not require Init() before Start()
+  * Ensure dependencies are running before initializing containers
+  * Add container dependencies to Inspect output
+  * Add backend code for generic dependencies
+  * Vendor in latest containers/image
+  * Makefile: Fix typo podmon -> podman
+  * Correct a godoc comment
+  * Sleep for 5 seconds before pushing to registry in tests
+  * Change errorf to warnf in warning removing ctr storage
+  * Don't return an ImageConfig when creating storage
+  * More gracefully handle unexpected storage deletion
+  * Remove crictl from Dockerfile
+  * Eliminate raceyness of sig-proxy test
+
 - Changelog for v0.3.5 (2018-03-29):
   * Allow sha256: prefix for input
   * Add secrets patch to podman
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 893dfa234..ef42ad090 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.4.1
+Version:        0.4.2
 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 3519a67ab..eaf5d2896 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.4.1-dev"
+const Version = "0.4.2-dev"