summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-11-15 15:42:48 -0500
committerGitHub <noreply@github.com>2018-11-15 15:42:48 -0500
commit236408bbbc14f6b637c4e9be19093d1a37b83f9c (patch)
treed2a206b693c2f218a114efcccff810e87e100e0b
parent1b52843cfd2ae254a6e52c74e564730f1c875c4c (diff)
parent02bd5d444343767ffdd321dffa66ae74e690f8f0 (diff)
downloadpodman-236408bbbc14f6b637c4e9be19093d1a37b83f9c.tar.gz
podman-236408bbbc14f6b637c4e9be19093d1a37b83f9c.tar.bz2
podman-236408bbbc14f6b637c4e9be19093d1a37b83f9c.zip
Merge pull request #1821 from mheon/bump-0.11.1.1
Bump to v0.11.1.1
-rw-r--r--Makefile2
-rw-r--r--changelog.txt29
2 files changed, 30 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 04d6230d6..d1fa65f23 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= 921ccac10c47e0865ec5e4ba00ebb69a03d89473
+EPOCH_TEST_COMMIT ?= 1b52843cfd2ae254a6e52c74e564730f1c875c4c
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 9aaec0e74..7b0f0f3af 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,32 @@
+- Changelog for v0.11.1.1 (2018-11-15)
+ * Vendor in containers/storage
+ * Add release notes for 0.11.1.1
+ * Increase pidWaitTimeout to 60s
+ * Cirrus: Add master branch testing status badge
+ * rootless: call IsRootless just once
+ * Bump golang to v1.10 in install.md
+ * Standardized container image for gofmt and lint
+ * Make list of approvers same as reviewers
+ * vendor: update ostree-go
+ * vendor.conf: fix typo
+ * Cleanup podman spec to not show git checkout is dirty
+ * Add space between num & unit in images output
+ * Update troubleshooting guide to deal with rootless path
+ * troubleshooting.md: add a recipe for rootless ping
+ * remove $-prefix from (most) shell examples
+ * docs: Fix duplicated entry for pod-container-unmount
+ * Better document rootless containers
+ * info: add rootless field
+ * Accurately update state if prepare() partially fails
+ * Do not hide errors when creating container with UserNSRoot
+ * rm -f now removes a paused container
+ * correct assignment of networkStatus
+ * podman_tutorial: cni build path has changed
+ * Bump gitvalidation epoch
+ * Bump to v0.11.2-dev
+ * Cirrus: Ignore any error from the IRC messenger
+ * rootless: default to fuse-overlayfs when available
+
- Changelog for v0.11.1 (2018-11-08)
* Update release notes for 0.11.1
* update seccomp.json