summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--changelog.txt23
2 files changed, 24 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6e75800b4..f99aaaeca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
GO ?= go
DESTDIR ?= /
-EPOCH_TEST_COMMIT ?= c264da80aab889c787ca4f9b72a9739b4f6f187e
+EPOCH_TEST_COMMIT ?= 1a5024193094a178cd93b675a0178062236c4a22
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 6373f219c..bc141cceb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,26 @@
+- Changelog for v0.12.1.1 (2018-12-07)
+ * Update release notes for v0.12.1.1
+ * Fix errors where OCI hooks directory does not exist
+ * add timeout to pod stop
+ * Remove manual handling of insecure registries in (podman search)
+ * Fix reporting the registries.conf path on error
+ * Remove manual handling of insecure registries in doPullImage
+ * Remove the forceSecure parameter on the pull call stack
+ * Remove manual handling of insecure registries in PushImageToReference
+ * Factor out the registries.conf location code in pkg/registries
+ * Remove the forceSecure parameter of Image.PushImageTo*
+ * Minimally update for the DockerInsecureSkipTLSVerify type change
+ * Bump gitvalidation epoch
+ * Bump to v0.12.2-dev
+ * Fix build on non-Linux
+ * Remove some unused data structures and code
+ * Vendor buildah after merging https://github.com/containers/buildah/pull/1214
+ * Update containers/image to 63a1cbdc5e6537056695cf0d627c0a33b334df53
+ * Cirrus: Document and codify base-image production
+ * Cirrus: Use Makefile for image-building
+ * Refactor BooleanAction to mimic golang interface
+ * generate kube
+
- Changelog for v0.12.1 (2018-12-06)
* Update release notes for 0.12.1
* bind mount /etc/resolv.conf|hosts in pods