]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test: modify test/cli/rbd/help.t for merge-diff
authorYunchuan Wen <yunchuanwen@ubuntukylin.com>
Tue, 6 Jan 2015 00:53:07 +0000 (08:53 +0800)
committerYunchuan Wen <yunchuanwen@ubuntukylin.com>
Mon, 12 Jan 2015 01:05:26 +0000 (01:05 +0000)
Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
src/test/cli/rbd/help.t

index 3818ee3cac26d3bf101d62249204bb94d97a9906..5e8b7f94e8b0f694a69813eed613532798f81b50 100644 (file)
     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