From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Feb 2015 11:07:36 +0000 (-0800)
Subject: Merge pull request #3485 from jdurgin/wip-merge-diff-testing
X-Git-Tag: v0.93~134
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0af16c36727102d79b3298cbe4a55b788d6f6089;p=ceph.git

Merge pull request #3485 from jdurgin/wip-merge-diff-testing

Improve merge-diff test
---

0af16c36727102d79b3298cbe4a55b788d6f6089