Merge pull request #834 from mheon/bump_0_5_4

Bump 0 5 4

4 files changed, 29 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 847a31041..276bb9a7f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 GO ?= go
-EPOCH_TEST_COMMIT ?= bbc522be8ec55e1
+EPOCH_TEST_COMMIT ?= 1930f5d7093e84cdcc9e327e296f4733f32b20c8
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 760660b06..116de2cac 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,29 @@
+- Changelog for v0.5.4 (2018-05-25):
+  * Vendor in latest projectatomic/buildah
+  * Rename addFIPSsModeSecret to addFIPSModeSecret
+  * Make references to the Process part of Spec conditional
+  * save and load should support multi-tag for docker-archive
+  * Implement python podman create and start
+  * Spell check strings and comments
+  * hooks/1.0.0: Error on empty process.args instead of panicking
+  * Set Entrypoint from image only if not already set
+  * Update podman build to match buildah bud functionality
+  * Fix test_runner call of podman varlink
+  * Fix handling of command in images
+  * Add support for Zulu timestamp parsing
+  * Clarify using podman build with a URL, Git repo, or archive.
+  * Vendor in latest container/storage for devicemapper support
+  * set varlink timeout to 1 seconds
+  * podman create, start, getattachsocket
+  * use $GO env-var instead of hard-coded go binary
+  * tidy up the copr spec
+  * honor multiple change values
+  * hooks/README: Fix some Markdown typos (e.g. missing runc target)
+  * oci-hooks.5: Discuss directory precedence and monitoring
+  * finish changing the path for varlink
+  * Tighten the security on the podman varlink socket
+  * Implement podman.containers.commit()
+
 - Changelog for v0.5.3 (2018-05-18):
   * remove hooks files reference and no varlink-python on f27 or epel
   * contrib/spec/podman.spec.in: Drop README-hooks
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 51926870c..9d6e37987 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -51,7 +51,7 @@
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           podman
-Version:        0.5.4
+Version:        0.6.1
 Release:        #COMMITDATE#.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 2711c5f2d..439111111 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.5.4-dev"
+const Version = "0.6.1-dev"