summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-10-17 18:53:20 -0400
committerGitHub <noreply@github.com>2018-10-17 18:53:20 -0400
commit05cadf31d24916215188ee839b0c0a824c31b822 (patch)
treefd55b55f17ac33a48d41613557bb9e4acefa8139
parent733cfe96819e1dc044e982b5321b3c902d1a47c6 (diff)
parent683d8b579b57025e16c97b80a77a5cc353594c8d (diff)
downloadpodman-05cadf31d24916215188ee839b0c0a824c31b822.tar.gz
podman-05cadf31d24916215188ee839b0c0a824c31b822.tar.bz2
podman-05cadf31d24916215188ee839b0c0a824c31b822.zip
Merge pull request #1679 from mheon/bump-0.10.1.3
Bump to v0.10.1.3
-rw-r--r--Makefile2
-rw-r--r--changelog.txt7
2 files changed, 8 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 0d97fe3d0..083858f35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= d12eb5f35a5b2580233a75986ce85c4ad39bedd3
+EPOCH_TEST_COMMIT ?= 733cfe96819e1dc044e982b5321b3c902d1a47c6
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index d53c806e4..ace41f1d9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,10 @@
+- Changelog for v0.10.1.3 (2018-10-17)
+ * Update release notes for 0.10.1.3
+ * Vendor in new new buildah/ci
+ * Fix podman in podman
+ * Bump gitvalidation epoch
+ * Bump to v0.10.2-dev
+
- 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