]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #3730 from ceph/wip-firefly-flock
authorGregory Farnum <greg@gregs42.com>
Thu, 26 Feb 2015 23:59:24 +0000 (15:59 -0800)
committerGregory Farnum <greg@gregs42.com>
Thu, 26 Feb 2015 23:59:24 +0000 (15:59 -0800)
backport ceph-fuse file locking patches to Firefly

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

Trivial merge