aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-09-10 16:21:22 -0400
committerGitHub <noreply@github.com>2018-09-10 16:21:22 -0400
commit123de3087e142f3a6c05ad35fc2095953065415b (patch)
tree281745d7e4ccf87d6b283cf90b0bbbd1816803ba
parent6ffce631db6e01f66b09cb0e894600182caa872c (diff)
parentca3ede269347b93d989758f384d08b4276ebd84d (diff)
downloadpodman-123de3087e142f3a6c05ad35fc2095953065415b.tar.gz
podman-123de3087e142f3a6c05ad35fc2095953065415b.tar.bz2
podman-123de3087e142f3a6c05ad35fc2095953065415b.zip
Merge pull request #1436 from mheon/bump-0.9.1.1
Bump to v0.9.1.1
-rw-r--r--Makefile2
-rw-r--r--changelog.txt8
2 files changed, 9 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 7cb60079e..05979d6b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 086f3732ab0f524f8965815c94d6e049200b2237
+EPOCH_TEST_COMMIT ?= 6ffce631db6e01f66b09cb0e894600182caa872c
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index ed35e13ef..918d10ba9 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,11 @@
+- Changelog for v0.9.1.1 (2018-09-10)
+ * Update release notes for 0.9.1.1
+ * Replace existing iptables handler with firewall code
+ * Vendor CNI plugins firewall code
+ * Fix displaying size on size calculation error
+ * Bump gitvalidation epoch
+ * Bump to v0.9.2-dev
+
- Changelog for v0.9.1 (2018-09-07)
* Update RELEASE_NOTES for 0.9.1 release
* Fix pod sharing for utsmode