]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9110ba5 a960f2f)
Merge PR #28901 into master
authorSage Weil <sage@redhat.com>
Mon, 8 Jul 2019 13:36:05 +0000 (08:36 -0500)
committerSage Weil <sage@redhat.com>
Mon, 8 Jul 2019 13:36:05 +0000 (08:36 -0500)
commitb2eb5232de8fca7c4865ec7c2d1f01cd0ded77ee
treeb4e4c26e474eebf137340c80549895a0391c470etree | snapshot
parent9110ba50a5aef28b99cf2e17c4a7cc4a5ca500ebcommit | diff
parenta960f2faa755a7a4ccf26af61f4cd43b5c3c14d5commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.