summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2019-10-02 12:42:10 -0400
committerMatthew Heon <mheon@redhat.com>2019-10-02 12:42:10 -0400
commita2fdb6ea0236fa3b5ea9a88dc513af310f07c49c (patch)
tree39d94eff6c2a872ae11bcbd4dab3fe61134e7990
parent257a985f5a7cff8f01891529ea89b0ea2800d61f (diff)
downloadpodman-a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c.tar.gz
podman-a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c.tar.bz2
podman-a2fdb6ea0236fa3b5ea9a88dc513af310f07c49c.zip
Bump to v1.6.1-rc1v1.6.1-rc1
Signed-off-by: Matthew Heon <mheon@redhat.com>
-rw-r--r--changelog.txt16
-rw-r--r--contrib/spec/podman.spec.in2
-rw-r--r--version/version.go2
3 files changed, 18 insertions, 2 deletions
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
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index dc734a6b4..3816bd0af 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -39,7 +39,7 @@
%global shortcommit_conmon %(c=%{commit_conmon}; echo ${c:0:7})
Name: podman
-Version: 1.6.1
+Version: 1.6.1-rc1
Release: #COMMITDATE#.git%{shortcommit0}%{?dist}
Summary: Manage Pods, Containers and Container Images
License: ASL 2.0
diff --git a/version/version.go b/version/version.go
index 9fcd5faa7..a0e7c66a9 100644
--- a/version/version.go
+++ b/version/version.go
@@ -4,7 +4,7 @@ package version
// NOTE: remember to bump the version at the top
// of the top-level README.md file when this is
// bumped.
-const Version = "1.6.1-dev"
+const Version = "1.6.1-rc1"
// RemoteAPIVersion is the version for the remote
// client API. It is used to determine compatibility