From 1f2e2a25bf0fec4a1e023a35903627e0562c88a6 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Fri, 25 May 2018 13:46:50 -0400
Subject: [PATCH] Bump to v0.5.4

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
---
 changelog.txt      | 26 ++++++++++++++++++++++++++
 version/version.go |  2 +-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/changelog.txt b/changelog.txt
index 760660b06d..116de2cacb 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/version/version.go b/version/version.go
index 2711c5f2d0..18ad574f4f 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.5.4"