summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--changelog.txt41
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 44 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ea6e9bfba..a839b1ab9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
GO ?= go
-EPOCH_TEST_COMMIT ?= c8208a845e734a3
+EPOCH_TEST_COMMIT ?= bbc522be8ec55e1
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index bffc86853..760660b06 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,44 @@
+- 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
+ * troubleshooting: Add console syntax highlighting
+ * Fix typo
+ * Refresh pods when refreshing podman state
+ * Add per-pod CGroups
+ * Add pod state
+ * hooks: Fix monitoring of multiple directories
+ * make sure hooks are renamed for copr spec
+ * Use container cleanup() functions when removing
+ * docs/podman.1: Link to hook documentation
+ * hooks/docs: Add oci-hooks.5 and per-package man page building
+ * Add Troubleshooting guide
+ * chrootuser: default to GID 0 when given a numeric --user
+ * Add python3 package to podman
+ * libpod: fix panic when using -t and the process fails to start
+ * Makefile: Use ?= for shell variables (ISODATE, etc.)
+ * Skip tests that are flaking, holding up merge queue
+ * Remove old varlink tests
+ * Allow push/save without image reference
+ * Vendor in latest containers/image
+ * Makefile: Respect GOBIN
+ * Fix podman inspect bash completions
+ * Update Tutorial with Fedora kit location
+ * Makefile: Drop find-godeps.sh for podman target
+ * Support pulling Dockerfile from http
+ * Refactor libpod python varlink bindings
+ * add more bash completions
+ * improve podman commit documentation and error messages
+ * Touch up logo links
+ * implement varlink commit
+ * fix segfault for podman push
+ * Add the Podman Logo
+ * logo: Remove unused directory
+ * hooks: Add package support for extension stages
+ * Gracefully handle containers removed from c/storage
+ * Add packaging for hooks/README.md
+ * Remove stop on error from Docker install switch in baseline tests
+ * docs: fix contrib/cni broken link
+
- Changelog for v0.5.2 (2018-05-11):
* vendor/golang.org/x/text: Vendor collate and language
* hooks: Order injection by collated JSON filename
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 33f69616c..d0ddcea25 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -45,7 +45,7 @@
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: podman
-Version: 0.5.3
+Version: 0.5.4
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 a0ec3b531..2711c5f2d 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.3-dev"
+const Version = "0.5.4-dev"