]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rbd: merge two diff files into one single file
authorYunchuan Wen <yunchuanwen@ubuntukylin.com>
Mon, 12 Jan 2015 01:04:39 +0000 (01:04 +0000)
committerYunchuan Wen <yunchuanwen@ubuntukylin.com>
Mon, 12 Jan 2015 01:04:39 +0000 (01:04 +0000)
commit337f82197b45c869e47690e6b74a40300d8d8e80
treef19cbcc0d39c960b54b31259c7b65e2b5c6fa666
parent9c82efcc79382797183006ee276d1e0c8a1ccbeb
rbd: merge two diff files into one single file

Note: It does not do the merging work if
either of the source diff files is stripped,
since which complicates the process and is
rarely used

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: MingXin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
src/rbd.cc