From: Gregory Farnum <greg@gregs42.com>
Date: Thu, 26 Feb 2015 23:59:24 +0000 (-0800)
Subject: Merge pull request #3730 from ceph/wip-firefly-flock
X-Git-Tag: v0.80.9~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0820041e6515c82c41b81b9e6825e2dd5fcb8165;p=ceph.git

Merge pull request #3730 from ceph/wip-firefly-flock

backport ceph-fuse file locking patches to Firefly

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

0820041e6515c82c41b81b9e6825e2dd5fcb8165