summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-03-05 06:11:10 -0800
committerGitHub <noreply@github.com>2019-03-05 06:11:10 -0800
commit05822a4da92a01c28aa824ac347c8c2fc8f118b4 (patch)
treec0fc1b7c919df7a66dd02680f605d9a15e81ef85
parent85b116707bf84125f00c3bf39e28ef33a7d49066 (diff)
parenteedc4cf4d26715e80fcdf00dcb08545b0c6469d3 (diff)
downloadpodman-05822a4da92a01c28aa824ac347c8c2fc8f118b4.tar.gz
podman-05822a4da92a01c28aa824ac347c8c2fc8f118b4.tar.bz2
podman-05822a4da92a01c28aa824ac347c8c2fc8f118b4.zip
Merge pull request #2535 from mheon/bump-1.1.2
Bump to v1.1.2
-rw-r--r--Makefile2
-rw-r--r--changelog.txt17
2 files changed, 18 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 60fb3eda7..c215022a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= cabfc9b6fb16c5b55d70140182496bbe129f6a4b
+EPOCH_TEST_COMMIT ?= 4b80517b6a638ff06f8ad432f0f0f5839283d058
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 9dd0ae2d1..7db579f3a 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,20 @@
+- Changelog for v1.1.2 (2019-03-04)
+ * Fix #2521
+ * Update release notes for v1.1.2
+ * Change timestamp format for podman logs
+ * Don't extract tar file in podman cp
+ * runtime: fill a proper default tmpdir when --config is used
+ * Add additional defense against 0-length log segfaults
+ * When logging with timestamps, append only until newline
+ * Ensure that each log line is newline-terminated
+ * A few more usage-message tweaks
+ * Add missing short flag -l for run/create
+ * Fix aliased commands to actually work
+ * Support podman-remote stop container(s)
+ * Add tests to make sure podman container and podman image commands work
+ * Bump gitvalidation epoch
+ * Bump to v1.2.0-dev
+
- Changelog for v1.1.1 (2019-03-01)
* Update release notes for v1.1.1
* Pull image for runlabel if not local