]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fbc8be4 ff7813a)
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)
commitbe49d465215d00a3da78d57e32a794d31cfa744b
tree501d79e55c0d4900303dbb450c56379847cab151tree | snapshot
parentfbc8be423c351eabb788fd5b1ac0124dadae0eafcommit | diff
parentff7813aa14c45e376daf812be2276345872d1140commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.