From: Greg Farnum <gfarnum@redhat.com>
Date: Wed, 13 Jan 2016 02:37:56 +0000 (-0800)
Subject: Merge branch 'wip-13569' of git://github.com/ukernel/ceph into greg-fs-testing
X-Git-Tag: v10.0.3~48^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11cd84ca713724389de003c9618816ba32530ca9;p=ceph.git

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

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

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

11cd84ca713724389de003c9618816ba32530ca9