]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #29003 into master
authorSage Weil <sage@redhat.com>
Fri, 12 Jul 2019 22:20:47 +0000 (17:20 -0500)
committerSage Weil <sage@redhat.com>
Fri, 12 Jul 2019 22:20:47 +0000 (17:20 -0500)
* 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>

Trivial merge