From: Josh Durgin <jdurgin@redhat.com>
Date: Mon, 23 Feb 2015 23:37:19 +0000 (-0800)
Subject: rbd: add merge_diff test
X-Git-Tag: v0.94.10~27^2^2~161
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=473cba0ffe2399ecd120f9f5e66099d1749dc678;p=ceph.git

rbd: add merge_diff test

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit e7bf3d05a63f7cf99b3ff46fb9ac96e73ffb5c40)
---

diff --git a/suites/rbd/singleton/all/merge_diff.yaml b/suites/rbd/singleton/all/merge_diff.yaml
new file mode 100644
index 000000000000..fc58d827b0b0
--- /dev/null
+++ b/suites/rbd/singleton/all/merge_diff.yaml
@@ -0,0 +1,8 @@
+roles:
+- [mon.a, osd.0, osd.1, client.0]
+tasks:
+- install:
+- ceph:
+- workunit:
+    clients:
+      all: [rbd/merge_diff.sh]