From 4bea3e946610d5d13b216e443276080949668d60 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Tue, 16 Oct 2018 13:52:10 -0400
Subject: Bump to v0.10.1.1
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
---
changelog.txt | 18 ++++++++++++++++++
contrib/spec/podman.spec.in | 2 +-
version/version.go | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/changelog.txt b/changelog.txt
index a31cd26e9..67120b8f4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,21 @@
+- 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.
+ * Cirrus: Enable debugging delay on non-zero exit
+ * Touchup fileo typo
+ * volume: resolve symlinks in paths
+ * volume: write the correct ID of the container in error messages
+ * vendor: update containers/buildah
+ * papr: relabel GOPATH/github.com/containers/libpod
+ * tests: do not fail in the cleanup phase
+ * tests: do not make assumptions on the mount output
+ * papr_prepare: remove double process for starting up .papr.sh
+ * Add support for pod commands
+ * Support auth file environment variable & add change to man pages
+ * Generate a passwd file for users not in container
+ * Bump gitvalidation epoch
+ * Bump to v0.10.2-dev
+
- Changelog for v0.10.1 (2018-10-11)
* Swap from map to channels for podman stop workers
* Add release notes for 0.10.1
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index c2d8fc59d..b3cca1b1b 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.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 0fd4e5aeb..d7bed93c5 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.1"
--
cgit v1.2.3-54-g00ecf
From a9d9444b700747467f7c08e119f9e3ff17f79467 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Tue, 16 Oct 2018 13:52:15 -0400
Subject: Bump to v0.10.2-dev
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
---
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 b3cca1b1b..c2d8fc59d 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.1
+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 d7bed93c5..0fd4e5aeb 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.1"
+const Version = "0.10.2-dev"
--
cgit v1.2.3-54-g00ecf
From f98c4a9c73db0aa8d5f72c7af1a40ec6304aac22 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Tue, 16 Oct 2018 13:52:16 -0400
Subject: Bump gitvalidation epoch
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 13d7e98e8..0c5775606 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 44b650c38e86ff87786c29113feb88e28ff541be
+EPOCH_TEST_COMMIT ?= 4aeaadb8571365563d6a86e900cc904d04d367b9
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
--
cgit v1.2.3-54-g00ecf