From 66d34998316adac9f9d3c0f422705bf4b02011d5 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 7 Dec 2018 14:14:47 -0500 Subject: Bump to v0.12.1.1 Signed-off-by: Matthew Heon --- changelog.txt | 23 +++++++++++++++++++++++ contrib/spec/podman.spec.in | 2 +- version/version.go | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 6373f219c..bc141cceb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,26 @@ +- Changelog for v0.12.1.1 (2018-12-07) + * Update release notes for v0.12.1.1 + * Fix errors where OCI hooks directory does not exist + * add timeout to pod stop + * Remove manual handling of insecure registries in (podman search) + * Fix reporting the registries.conf path on error + * Remove manual handling of insecure registries in doPullImage + * Remove the forceSecure parameter on the pull call stack + * Remove manual handling of insecure registries in PushImageToReference + * Factor out the registries.conf location code in pkg/registries + * Remove the forceSecure parameter of Image.PushImageTo* + * Minimally update for the DockerInsecureSkipTLSVerify type change + * Bump gitvalidation epoch + * Bump to v0.12.2-dev + * Fix build on non-Linux + * Remove some unused data structures and code + * Vendor buildah after merging https://github.com/containers/buildah/pull/1214 + * Update containers/image to 63a1cbdc5e6537056695cf0d627c0a33b334df53 + * Cirrus: Document and codify base-image production + * Cirrus: Use Makefile for image-building + * Refactor BooleanAction to mimic golang interface + * generate kube + - Changelog for v0.12.1 (2018-12-06) * Update release notes for 0.12.1 * bind mount /etc/resolv.conf|hosts in pods diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 20e2a84ea..6f743e063 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: 0.12.2 +Version: 0.12.1.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 45dc93d91..def258950 100644 --- a/version/version.go +++ b/version/version.go @@ -4,4 +4,4 @@ package version // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -const Version = "0.12.2-dev" +const Version = "0.12.1.1" -- cgit v1.2.3-54-g00ecf From 13580725cf957985170ce89a4e5fc272a6ad6c1e Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 7 Dec 2018 14:14:51 -0500 Subject: Bump to v0.12.2-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 6f743e063..20e2a84ea 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: 0.12.1.1 +Version: 0.12.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 def258950..45dc93d91 100644 --- a/version/version.go +++ b/version/version.go @@ -4,4 +4,4 @@ package version // NOTE: remember to bump the version at the top // of the top-level README.md file when this is // bumped. -const Version = "0.12.1.1" +const Version = "0.12.2-dev" -- cgit v1.2.3-54-g00ecf From d16f791851b44c7362f0005e31041d0d62c31bd0 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Fri, 7 Dec 2018 14:14:51 -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 6e75800b4..f99aaaeca 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GO ?= go DESTDIR ?= / -EPOCH_TEST_COMMIT ?= c264da80aab889c787ca4f9b72a9739b4f6f187e +EPOCH_TEST_COMMIT ?= 1a5024193094a178cd93b675a0178062236c4a22 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD -- cgit v1.2.3-54-g00ecf