From a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 2 Oct 2019 12:42:10 -0400 Subject: [PATCH 1/3] Bump to v1.6.1-rc1 Signed-off-by: Matthew Heon --- changelog.txt | 16 ++++++++++++++++ contrib/spec/podman.spec.in | 2 +- version/version.go | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 7d6522c4dd..66f1dd1bb8 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,19 @@ +- Changelog for v1.6.1-rc1 (2019-10-02) + * rootless: set DBUS_SESSION_BUS_ADDRESS if it is not set + * install.md: add libbtrfs-dev for Debian build + * Bump github.com/onsi/gomega from 1.5.0 to 1.7.0 + * Cirrus: Show names/versions of critical packages + * network: add workaround for slirp4netns --enable-sandbox issue + * rootless: do not attempt a CNI refresh + * Bump github.com/containernetworking/plugins from 0.8.1 to 0.8.2 + * network: hide EPERM warning when rootless + * networking: fix segfault when slirp4netns is missing + * Bump gitvalidation epoch + * Bump to v1.6.1-dev + * Move derivitive doc so it won't be treated as a manpage + * catatonit: clone and build + * bump catatonit to v0.1.4 + - Changelog for v1.6.0 (2019-09-30) * info: add cgroups2 * Finalize release notes for 1.6.0 final diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index dc734a6b4d..3816bd0af3 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.6.1 +Version: 1.6.1-rc1 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 9fcd5faa7c..a0e7c66a90 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.6.1-dev" +const Version = "1.6.1-rc1" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility From faf70ae58981a87755a799b7ea911555a45c0f5b Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 2 Oct 2019 12:42:13 -0400 Subject: [PATCH 2/3] Bump to v1.6.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 3816bd0af3..dc734a6b4d 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.6.1-rc1 +Version: 1.6.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 a0e7c66a90..9fcd5faa7c 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.6.1-rc1" +const Version = "1.6.1-dev" // RemoteAPIVersion is the version for the remote // client API. It is used to determine compatibility From 3018d700bb3feb44b20857de3be349f434f354f3 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 2 Oct 2019 12:42:13 -0400 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 e35264a743..fe4f2ffe36 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org GO ?= go DESTDIR ?= -EPOCH_TEST_COMMIT ?= d7eba026876e4a6a362464dcf08fe6757ebedd1a +EPOCH_TEST_COMMIT ?= 257a985f5a7cff8f01891529ea89b0ea2800d61f HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD