From 2b4f8d1f5f56cdf42f4164f0d1468361a5ae14da Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 17 Oct 2018 11:34:09 -0400 Subject: [PATCH 1/3] Bump to v0.10.1.2 Signed-off-by: Matthew Heon --- changelog.txt | 6 ++++++ contrib/spec/podman.spec.in | 2 +- version/version.go | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changelog.txt b/changelog.txt index 67120b8f44..d53c806e41 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,9 @@ +- Changelog for v0.10.1.2 (2018-10-17) + * Update release notes for 0.10.1.2 + * Fix CGroup paths used for systemd CGroup mount + * Bump gitvalidation epoch + * Bump to v0.10.2-dev + - Changelog for v0.10.1.1 (2018-10-16) * Update release notes for 0.10.1.1 * Mount proper cgroup for systemd to manage inside of the container. diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index c2d8fc59db..9adb1ddbd0 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.10.2 +Version: 0.10.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 0fd4e5aebd..43ca4ccee6 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.10.2-dev" +const Version = "0.10.1.2" From 74cce34e31f5f8862393d3ed2c8bd01750c7cd83 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 17 Oct 2018 11:34:13 -0400 Subject: [PATCH 2/3] Bump to v0.10.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 9adb1ddbd0..c2d8fc59db 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.10.1.2 +Version: 0.10.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 43ca4ccee6..0fd4e5aebd 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.10.1.2" +const Version = "0.10.2-dev" From 6a32daad08b5c6510e710345a0214de6b3095204 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Wed, 17 Oct 2018 11:34: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 0c57756065..0d97fe3d03 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GO ?= go DESTDIR ?= / -EPOCH_TEST_COMMIT ?= 4aeaadb8571365563d6a86e900cc904d04d367b9 +EPOCH_TEST_COMMIT ?= d12eb5f35a5b2580233a75986ce85c4ad39bedd3 HEAD ?= HEAD CHANGELOG_BASE ?= HEAD~ CHANGELOG_TARGET ?= HEAD