summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--changelog.txt16
2 files changed, 17 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index e35264a74..fe4f2ffe3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ export GOPROXY=https://proxy.golang.org
GO ?= go
DESTDIR ?=
-EPOCH_TEST_COMMIT ?= d7eba026876e4a6a362464dcf08fe6757ebedd1a
+EPOCH_TEST_COMMIT ?= 257a985f5a7cff8f01891529ea89b0ea2800d61f
HEAD ?= HEAD
CHANGELOG_BASE ?= HEAD~
CHANGELOG_TARGET ?= HEAD
diff --git a/changelog.txt b/changelog.txt
index 7d6522c4d..66f1dd1bb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,19 @@
+- Changelog for v1.6.1-rc1 (2019-10-02)
+ * rootless: set DBUS_SESSION_BUS_ADDRESS if it is not set
+ * install.md: add libbtrfs-dev for Debian build
+ * Bump github.com/onsi/gomega from 1.5.0 to 1.7.0
+ * Cirrus: Show names/versions of critical packages
+ * network: add workaround for slirp4netns --enable-sandbox issue
+ * rootless: do not attempt a CNI refresh
+ * Bump github.com/containernetworking/plugins from 0.8.1 to 0.8.2
+ * network: hide EPERM warning when rootless
+ * networking: fix segfault when slirp4netns is missing
+ * Bump gitvalidation epoch
+ * Bump to v1.6.1-dev
+ * Move derivitive doc so it won't be treated as a manpage
+ * catatonit: clone and build
+ * bump catatonit to v0.1.4
+
- Changelog for v1.6.0 (2019-09-30)
* info: add cgroups2
* Finalize release notes for 1.6.0 final