]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
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)
* 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>

Trivial merge