From: Sage Weil <sage@redhat.com>
Date: Thu, 15 Oct 2015 20:35:10 +0000 (-0400)
Subject: Merge pull request #6287 from jcsp/wip-test-fixes
X-Git-Tag: v0.94.4~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5764e233e56be08a59ffe6292f6fba9a76288aee;p=ceph.git

Merge pull request #6287 from jcsp/wip-test-fixes

git path backports for hammer
---

5764e233e56be08a59ffe6292f6fba9a76288aee