From: Greg Farnum <gfarnum@redhat.com>
Date: Fri, 8 Apr 2016 00:07:16 +0000 (-0700)
Subject: Merge remote-tracking branch 'github/wip-fs-lockouts' into greg-fs-testing
X-Git-Tag: v10.1.2~3^2^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f6209798f8c702ab2f0a3a2ae231144f4d38d304;p=ceph.git

Merge remote-tracking branch 'github/wip-fs-lockouts' into greg-fs-testing

Protect a number of unstable/experimental features behind durable flags

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

Reviewed-by: John Spray <john.spray@redhat.com>
---

f6209798f8c702ab2f0a3a2ae231144f4d38d304