Merge pull request #3339 from mheon/bump-1.4.1

Bump to v1.4.1

4 files changed, 53 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 9660ad78d..df76d7adf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GO ?= go
 DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 1f31892a9fd8573d4b25274b208e6b9f860cdf81
+EPOCH_TEST_COMMIT ?= 90e3c9002b2293569e0cec168a30ecb962b00034
 HEAD ?= HEAD
 CHANGELOG_BASE ?= HEAD~
 CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index ece82e15b..3b1260c90 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,53 @@
+- Changelog for v1.4.1 (2019-06-14)
+  * Completely disable global options test
+  * Update release notes for 1.4.1
+  * Skip runlabel global options test for podman-in-podman
+  * pkg/apparmor: fix when AA is disabled
+  * Fix ENV parsing on `podman import`
+  * Fix storage-opts type in Cobra
+  * Use the logical registry location instead of the physical one in (podman info)
+  * Update containers/image to v2.0.0, and buildah to v1.8.4
+  * Document exit codes for podman exec
+  * Add --storage flag to 'podman rm' (local only)
+  * When creating exit command, pass storage options on
+  * Bump cirrus images
+  * Mention the new Podman mailing list in contributing.md
+  * Update 1.4.0 release notes with ID -> Id in inspect
+  * Bump conmon to 0.3.0
+  * Cirrus: Guarantee ssh is running for rootless
+  * Purge all use of easyjson and ffjson in libpod
+  * Split mount options in inspect further
+  * storage: support --mount type=bind,bind-nonrecursive
+  * oci: allow to specify what runtimes support JSON
+  * storage: fix typo
+  * oci: use json formatted errors from the runtime
+  * Make Inspect's mounts struct accurate to Docker
+  * Provide OCI spec path in `podman inspect` output
+  * If container is not in correct state podman exec should exit with 126
+  * rootless: use the slirp4netns builtin DNS first
+  * Add --filename option to generate kube
+  * Fix podman-remote to user default username
+  * Prohibit use of positional args with --import
+  * BATS tests - get working again
+  * Add a test for 'podman play kube' to prevent regression
+  * Cirrus: New images w/o buildah
+  * Remove source-built buildah from CI
+  * standardize documentation formatting
+  * Touchup upstream Dockerfile
+  * only set log driver if it isn't empty
+  * Fix cgo includes for musl
+  * When you change the storage driver we ignore the storage-options
+  * Update vendor on containers/storage to v1.12.10
+  * Bump gitvalidation epoch
+  * Bump to v1.4.1-dev
+  * Default 'pause' to false for 'podman cp'
+  * Update c/storage to 9b10041d7b2ef767ce9c42b5862b6c51eeb82214
+  * Fix spelling
+  * fix tutorial link to install.md
+  * Cirrus: Minor cleanup of dependencies and docs
+  * Begin to break up pkg/inspect
+  * docs: Add CI section and links
+
 - Changelog for v1.4.0 (2019-06-07)
   * Update release notes for v1.4.0
   * Update release notes for v1.4.0
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index d755fd1aa..d0ad07044 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.1
+Version: 1.4.2
 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 c3917c016..2ef7a9c65 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.1-dev"
+const Version = "1.4.2-dev"
 
 // RemoteAPIVersion is the version for the remote
 // client API.  It is used to determine compatibility