From: Josh Durgin <jdurgin@redhat.com>
Date: Fri, 16 Jan 2015 20:08:02 +0000 (-0800)
Subject: Merge pull request #3292 from kylinstorage/rbd-merge-diff-v2
X-Git-Tag: v0.93~268
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a845139d1f274da476e0114daff5aa7585bbabd1;p=ceph.git

Merge pull request #3292 from kylinstorage/rbd-merge-diff-v2

rbd: merge diff files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
---

a845139d1f274da476e0114daff5aa7585bbabd1