Skip to content

Commit

Permalink
Merge pull request #4170 from mheon/bump-1.6.1-rc1
Browse files Browse the repository at this point in the history
Bump to v1.6.1-RC1
  • Loading branch information
openshift-merge-robot authored Oct 2, 2019
2 parents dac7889 + 3018d70 commit 0046b01
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 16 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 0046b01

Please sign in to comment.