From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 8 Jul 2020 19:32:18 +0000 (-0700)
Subject: Merge pull request #35737 from neha-ojha/wip-46165-octopus
X-Git-Tag: v15.2.5~160
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c9ba5d31d37467bc598878c3f3d4d43ea14ea17;p=ceph.git

Merge pull request #35737 from neha-ojha/wip-46165-octopus

octopus: osd: make message cap option usable again

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Vikhyat Umrao <vikhyat@redhat.com>
---

6c9ba5d31d37467bc598878c3f3d4d43ea14ea17