]> 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: db54fd1 f253e3c)
Merge PR #22947 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 21 Jul 2018 03:13:24 +0000 (20:13 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 21 Jul 2018 03:13:24 +0000 (20:13 -0700)
commitf61807bf788f968c980b60235e183dabee6ca34b
tree0342040938443f05beca987c982b8246c293c88ctree | snapshot
parentdb54fd109dc1938e72ab1b700b737a7f7d449ff5commit | diff
parentf253e3c3117aad183b05b863474c6d92fb923ed4commit | diff
Merge PR #22947 into master

* refs/pull/22947/head:
test: validate empty json output during recursive scrub
test: subclass test_scrub.Workload from CephFSTestCase
mds: dump minimal cli output during recursive scrub trigger

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Unnamed repository; edit this file 'description' to name the repository.