From: Greg Farnum <gfarnum@redhat.com>
Date: Mon, 20 Apr 2015 01:18:35 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-10390' into greg-testing-quotas
X-Git-Tag: v10.2.6~165^2^2~500^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f83976c2588aafc3992155b1405f6da0476054c7;p=ceph.git

Merge remote-tracking branch 'origin/wip-10390' into greg-testing-quotas

Conflicts:
	suites/fs/recovery/tasks/mds-full.yaml
---

f83976c2588aafc3992155b1405f6da0476054c7
diff --cc suites/fs/recovery/tasks/client-limits.yaml
index 4cf874d5df83,3bb6d0246fa2..d4016f51d729
--- a/suites/fs/recovery/tasks/client-limits.yaml
+++ b/suites/fs/recovery/tasks/client-limits.yaml
@@@ -1,8 -1,5 +1,10 @@@
  
 +overrides:
 +  ceph:
 +    log-whitelist:
 +      - responding to mclientcaps\(revoke\)
 +
  tasks:
- - mds_client_limits:
+   - cephfs_test_runner:
+       modules:
+         - tasks.cephfs.test_client_limits
diff --cc suites/fs/recovery/tasks/mds-full.yaml
index fe52ae32043a,86d1d44022bb..b9c46a1641c9
--- a/suites/fs/recovery/tasks/mds-full.yaml
+++ b/suites/fs/recovery/tasks/mds-full.yaml
@@@ -1,13 -1,12 +1,15 @@@
  
  overrides:
-     ceph:
-         log-whitelist:
-           - OSD full dropping all updates
-           - OSD near full
-         conf:
-             osd:
-               osd objectstore: memstore
-               memstore device bytes: 100000000
+   ceph:
++    log-whitelist:
++      - OSD full dropping all updates
++      - OSD near full
+     conf:
+       osd:
+         osd objectstore: memstore
+         memstore device bytes: 100000000
  
  tasks:
-     - mds_full:
+   - cephfs_test_runner:
+       modules:
+         - tasks.cephfs.test_full