From 0ad9b6bf2aea4ba37e8c9738feabec61343ba175 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 4 Mar 2019 19:34:04 -0500 Subject: Bump to v1.1.2 Signed-off-by: Matthew Heon --- changelog.txt | 17 +++++++++++++++++ contrib/spec/podman.spec.in | 2 +- version/version.go | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) 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 diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 703b942b6..4787bbef7 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.2.0 +Version: 1.1.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 89b5fbd8b..56b61b0f0 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.2.0-dev" +const Version = "1.1.2" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility -- cgit v1.2.3-54-g00ecf From feeb48689e1ade6d02f57e83bcca98195e8799a2 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 4 Mar 2019 19:34:07 -0500 Subject: Bump to v1.2.0-dev Signed-off-by: Matthew Heon --- contrib/spec/podman.spec.in | 2 +- version/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 4787bbef7..703b942b6 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.1.2 +Version: 1.2.0 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 56b61b0f0..89b5fbd8b 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.1.2" +const Version = "1.2.0-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility -- cgit v1.2.3-54-g00ecf From eedc4cf4d26715e80fcdf00dcb08545b0c6469d3 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 4 Mar 2019 19:34:07 -0500 Subject: Bump gitvalidation epoch Signed-off-by: Matthew Heon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf