From: Sage Weil <sage@redhat.com>
Date: Thu, 22 Aug 2019 17:27:26 +0000 (-0500)
Subject: Merge PR #29774 into master
X-Git-Tag: v15.1.0~1809
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2dca76ac843aa9b0dc60bfc368baca9c08869c0b;p=ceph.git

Merge PR #29774 into master

* refs/pull/29774/head:
	qa/standalone/scrub/osd-scrub-snaps: snapmapper omap is now 'm'

Reviewed-by: David Zafman <dzafman@redhat.com>
---

2dca76ac843aa9b0dc60bfc368baca9c08869c0b