From 9748655921a59c440aebfd1bb365f7cffd7e7adc Mon Sep 17 00:00:00 2001 From: Yunchuan Wen Date: Thu, 15 Jan 2015 02:31:41 +0000 Subject: [PATCH] man: add help for rbd merge-diff command Signed-off-by: Yunchuan Wen Signed-off-by: Li Wang --- doc/man/8/rbd.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/man/8/rbd.rst b/doc/man/8/rbd.rst index 542454715fa2c..41f18127b26db 100644 --- a/doc/man/8/rbd.rst +++ b/doc/man/8/rbd.rst @@ -190,6 +190,14 @@ Commands metadata about image size changes, and the start and end snapshots. It efficiently represents discarded or 'zero' regions of the image. +:command:`merge-diff` [*first-diff-path*] [*second-diff-path*] [*merged-diff-path*] + Merge two continuous incremental diffs of an image into one single diff. The + first diff's end snapshot must be equal with the second diff's start snapshot. + The first diff could be - for stdin, and merged diff could be - for stdout, which + enables multiple diff files to be merged using something like + 'rbd merge-diff first second - | rbd merge-diff - third result'. Note this command + currently only support the source incremental diff with stripe_count == 1 + :command:`import-diff` [*src-path*] [*image-name*] Imports an incremental diff of an image and applies it to the current image. If the diff was generated relative to a start snapshot, we verify that snapshot already exists before -- 2.39.5