From: Sage Weil <sage@redhat.com>
Date: Tue, 24 Mar 2020 01:09:41 +0000 (-0500)
Subject: Merge remote-tracking branch 'gh/octopus'
X-Git-Tag: v16.0.0^0
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=895b856aeedf3d5874b7a8bca263dd3fc13cbee9;p=ceph.git

Merge remote-tracking branch 'gh/octopus'
---

895b856aeedf3d5874b7a8bca263dd3fc13cbee9