From: Greg Farnum <gfarnum@redhat.com>
Date: Tue, 26 Jan 2016 19:06:07 +0000 (-0800)
Subject: Merge branch 'wip-14365' of git://github.com/jcsp/ceph into greg-fs-testing
X-Git-Tag: v10.0.4~137^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=febcc065c2cd273e2a4ed91edc1d6512c9c503a1;p=ceph.git

Merge branch 'wip-14365' of git://github.com/jcsp/ceph into greg-fs-testing

https://github.com/ceph/ceph/pull/7312

Reviewed-by: Yan, Zheng <zyan@redhat.com>
---

febcc065c2cd273e2a4ed91edc1d6512c9c503a1