From b7ce1157b00af09f4a09e39b377aa3abff46ee05 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 6 Jan 2020 15:16:35 -0500 Subject: [PATCH 1/3] Bump to v1.7.0 Signed-off-by: Matthew Heon --- changelog.txt | 7 +++++++ version/version.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index a3e1b474f1..f539bec996 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +- Changelog for v1.7.0 (2020-01-06) + * (minor) fix broken links to container-policy.json.5 + * Generate binaries only if they are changes in src code. + * Fix presentation of man page tables + * Bump gitvalidation epoch + * Bump to v1.7.0-dev + - Changelog for v1.7.0-rc2 (2020-01-02) * Update release notes with further changes from 1.7.0 * refactor network commands diff --git a/version/version.go b/version/version.go index e75d1e7139..dbd0b726bc 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.7.0-dev" +const Version = "1.7.0" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility From 08849db4b0dd758d93eb2ffda5e9e5c03b3699b8 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 6 Jan 2020 15:16:38 -0500 Subject: [PATCH 2/3] Bump to v1.7.1-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 63f569a510..25c70c3921 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -43,7 +43,7 @@ %global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7}) Name: podman -Version: 1.7.0 +Version: 1.7.1 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 dbd0b726bc..ee25517e79 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.7.0" +const Version = "1.7.1-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility From 8e4a489e1b26fa56e2bc0ef8ac4fb203d0f95066 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 6 Jan 2020 15:16:38 -0500 Subject: [PATCH 3/3] Bump gitvalidation epoch Signed-off-by: Matthew Heon --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f87990fcd..1173f43a01 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go DESTDIR ?= -EPOCH_TEST_COMMIT ?= 1faa5bb6cdddc2d4b36b1c25261952c9ccf90f61 +EPOCH_TEST_COMMIT ?= 2d8f1c8fda4d0a8b7c41addbc89f0b2f83908ec2 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD