From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 5 Jan 2016 16:29:14 +0000 (-0500)
Subject: Merge pull request #7046 from clever215/merge_diff_1224
X-Git-Tag: v10.0.3~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb5e852046085c68d500236734185981365cb735;p=ceph.git

Merge pull request #7046 from clever215/merge_diff_1224

rbd: correct an output string for merge-diff

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

eb5e852046085c68d500236734185981365cb735