Merge pull request #3371 from mheon/bump-1.4.2

Bump to v1.4.2

4 files changed, 32 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 027f10445..881236452 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GO ?= go
 DESTDIR ?=
-EPOCH_TEST_COMMIT ?= 90e3c9002b2293569e0cec168a30ecb962b00034
+EPOCH_TEST_COMMIT ?= 5df8178c995fe6422f0fed258cd65f6cbcf26f2e
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 3b1260c90..9e201ecb4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,32 @@
+- Changelog for v1.4.2 (2019-06-18)
+  * Update release notes for Podman 1.4.2
+  * updating podman logo files
+  * fix port -l timing with healthchecks
+  * Bump Buildah to v1.9.0
+  * Swap to using the on-disk spec for inspect mounts
+  * Replace podman.svg; closes #3350
+  * cmd, docs, test: fix some typos
+  * run BATS tests in Cirrus
+  * Move the Config portion of Inspect into libpod
+  * Add remote client logging to a file
+  * Fix subgidname option in docs for podman run
+  * stop/kill: inproper state errors: s/in state/is in state/
+  * test: add test for logs -f
+  * kill: print ID and state for non-running containers
+  * API.md: fix few typos
+  * docs/podamn.1.md: fix typo: remove double the
+  * CONTRIBUTING.md: fix typo
+  * Remove unnecessary var type to fix lint warning
+  * Move installPrefix and etcDir into runtime.go
+  * Improve DESTDIR/PREFIX/ETCDIR handling
+  * Bump gitvalidation epoch
+  * Bump to v1.4.2-dev
+  * Change container command to contained
+  * Cirrus: Simplify log collection commands
+  * Accidently removed /run/lock from systemd mounts
+  * Add warning while untagging an image podman-load
+  * podman copy files to the volume with a container
+
 - Changelog for v1.4.1 (2019-06-14)
   * Completely disable global options test
   * Update release notes for 1.4.1
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index d0ad07044..68d02325a 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -39,7 +39,7 @@
 %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
 
 Name: podman
-Version: 1.4.2
+Version: 1.4.3
 Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
diff --git a/version/version.go b/version/version.go
index 2ef7a9c65..3dbf4768d 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,7 +4,7 @@ package version
 // NOTE: remember to bump the version at the top
 // of the top-level README.md file when this is
 // bumped.
-const Version = "1.4.2-dev"
+const Version = "1.4.3-dev"
 
 // RemoteAPIVersion is the version for the remote
 // client API.  It is used to determine compatibility