From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 29 Jan 2016 05:28:48 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/greg-fs-testing-126'
X-Git-Tag: v10.0.4~137
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7282%2Fhead;p=ceph.git

Merge remote-tracking branch 'origin/greg-fs-testing-126'
---

13062af18c91ecb1a7e9e9449c2cd7d25653cfd5