aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-10-17 11:35:36 -0400
committerGitHub <noreply@github.com>2018-10-17 11:35:36 -0400
commit2d14ba9e6fb2a53b9bc30c241303ba5d8d4e8926 (patch)
tree9aa72cac3cdb3265f481ff27d64746f16f255aa2
parentd12eb5f35a5b2580233a75986ce85c4ad39bedd3 (diff)
parent6a32daad08b5c6510e710345a0214de6b3095204 (diff)
downloadpodman-2d14ba9e6fb2a53b9bc30c241303ba5d8d4e8926.tar.gz
podman-2d14ba9e6fb2a53b9bc30c241303ba5d8d4e8926.tar.bz2
podman-2d14ba9e6fb2a53b9bc30c241303ba5d8d4e8926.zip
Merge pull request #1669 from mheon/bump-0.10.1.2
Bump to v0.10.1.2
-rw-r--r--Makefile2
-rw-r--r--changelog.txt6
2 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0c5775606..0d97fe3d0 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
diff --git a/changelog.txt b/changelog.txt
index 67120b8f4..d53c806e4 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.