From: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Date: Tue, 6 Jan 2015 00:53:07 +0000 (+0800)
Subject: test: modify test/cli/rbd/help.t for merge-diff
X-Git-Tag: v0.93~268^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c80c2cf3f9c0ee7e22c0c692e6d98ac2329767e0;p=ceph.git

test: modify test/cli/rbd/help.t for merge-diff

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
---

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 3818ee3cac26..5e8b7f94e8b0 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -25,6 +25,10 @@
     export-diff <image-name> [--from-snap <snap-name>] <path>
                                                 export an incremental diff to
                                                 path, or "-" for stdout
+    merge-diff <diff1> <diff2> <path>           merge <diff1> and <diff2> into
+                                                <path>, <diff1> could be "-"
+                                                for stdin, and <path> could be "-"
+                                                for stdout
     import-diff <path> <image-name>             import an incremental diff from
                                                 path or "-" for stdin
     (cp | copy) <src> <dest>                    copy src image to dest