summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-06-26 00:21:06 +0200
committerGitHub <noreply@github.com>2019-06-26 00:21:06 +0200
commitfbf5e80337c6399aa54c8ea1bc316eddb369ab0b (patch)
tree1498dcecf28419f49d95509cd0781704ca96d62e
parentcc53adaf413ce91b73a4f9b57bda7b34068b1940 (diff)
parent9cb7586eef7674375de7fd0188465adf71de5645 (diff)
downloadpodman-fbf5e80337c6399aa54c8ea1bc316eddb369ab0b.tar.gz
podman-fbf5e80337c6399aa54c8ea1bc316eddb369ab0b.tar.bz2
podman-fbf5e80337c6399aa54c8ea1bc316eddb369ab0b.zip
Merge pull request #3430 from mheon/bump-1.4.3
Bump to v1.4.3
-rw-r--r--Makefile2
-rw-r--r--changelog.txt61
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
4 files changed, 64 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index ab886fa3a..108a37146 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?=
-EPOCH_TEST_COMMIT ?= 5df8178c995fe6422f0fed258cd65f6cbcf26f2e
+EPOCH_TEST_COMMIT ?= 5b7086abda91f4301af3bfb642d416a22349c276
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 9e201ecb4..3bc7720a8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,64 @@
+- Changelog for v1.4.3 (2019-06-25)
+ * Update 'generate kube' tests to verify YAML
+ * Use a different method to retrieve YAML output in tests
+ * update dependencies
+ * Fix tests
+ * Change Marshal -> Unmarshal in generate kube tests
+ * Add test for generate kube on a pod with ports
+ * Only include ports in one container in Kube YAML
+ * Support aliases for .Src and .Dst in inspect .Mounts
+ * Fix a segfault in 'podman ps --sync'
+ * migrate to go-modules
+ * Makefile: add go-get function
+ * rootless: add an entry to /etc/hosts when using slirp4netns
+ * libpod.conf: add runtime crun
+ * Fix configs location in rootless tutorial.
+ * Add additional debugging when refreshing locks
+ * Fix gofmt
+ * Adjust names to match struct tags in Inspect
+ * Fix inspect --format '{{.Mounts}}.
+ * runtime.go: Add /usr/local/{s,}bin
+ * include make podman target in install instructions
+ * Add /usr/local/{s,}bin to conmon paths
+ * update cirrus image
+ * Update conmon to include attach socket unlink
+ * Add --latest, -l to 'podman diff'
+ * Build cgo files with -Wall -Werror
+ * Add some missing periods to the readme
+ * fix bug creats directory copying file
+ * Support Reproducible Builds by removing build path
+ * Support SOURCE_DATE_EPOCH
+ * Properly initialize container OCI runtime
+ * vendor containers/storage v1.12.11
+ * Handle containers whose OCIRuntime fields are paths
+ * Properly handle OCI runtime being set to a path
+ * add windows bridge format
+ * Make configuration validation not require a DB commit
+ * Avoid a read-write transaction on DB init
+ * Fix execvp uage in rootless_linux.c
+ * Handle possible asprintf failure in rootless_linux.c
+ * Fix format specifiers in rootless_linux.c
+ * Print container's OCI runtime in `inspect`
+ * Make a missing OCI runtime nonfatal
+ * Begin adding support for multiple OCI runtimes
+ * docs: add note to system migrate
+ * Fix documentation for log-driver
+ * Minor roadmap adjustment in README
+ * Spoof json-file logging support
+ * Add tests for cached and delegated mounts
+ * Vendor in logrus v1.4.2
+ * Add RUN with priv'd command build test
+ * Bump gitvalidation epoch
+ * Bump to v1.4.3-dev
+ * fix broken healthcheck tests
+ * Allow (but ignore) Cached and Delegated volume options
+ * Fix example in oci-hooks.5.md
+ * First pass rootless tutorial
+ * Correctly identify the defaults for cgroup-manager
+ * Cirrus: Fix F30 ssh guarantee
+ * Cirrus: Add support for testing F30
+ * Bump gate-container up to F30
+
- Changelog for v1.4.2 (2019-06-18)
* Update release notes for Podman 1.4.2
* updating podman logo files
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 5142de5d3..8e13f86de 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.3
+Version: 1.4.4
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 3dbf4768d..f19d56c31 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.3-dev"
+const Version = "1.4.4-dev"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility