From: Sage Weil <sage@redhat.com>
Date: Mon, 8 Jul 2019 13:36:05 +0000 (-0500)
Subject: Merge PR #28901 into master
X-Git-Tag: v15.1.0~2272
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b2eb5232de8fca7c4865ec7c2d1f01cd0ded77ee;p=ceph-ci.git

Merge PR #28901 into master

* refs/pull/28901/head:
	qa/standalone/scrub/osd-scrub-repair: fix 'scrub ok' grep
	osd/osd_types: remove 'snap_context' from SnapSet::dump()

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
---

b2eb5232de8fca7c4865ec7c2d1f01cd0ded77ee