From: Sage Weil <sage@redhat.com>
Date: Fri, 12 Jul 2019 22:20:47 +0000 (-0500)
Subject: Merge PR #29003 into master
X-Git-Tag: v15.1.0~2215
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be49d465215d00a3da78d57e32a794d31cfa744b;p=ceph.git

Merge PR #29003 into master

* refs/pull/29003/head:
	qa/standalone/scrub/osd-scrub-snaps.sh: adjust expected output
	osd/SnapMapper: to_raw_key: use hobject pool member, not SnapMapper:pool
	ceph-objectstore-tool: fix use of SnapSet::snaps
	qa/standalone/scrub/osd-scrub-snaps: fix kv grep

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

be49d465215d00a3da78d57e32a794d31cfa744b