]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit0820041e6515c82c41b81b9e6825e2dd5fcb8165
tree6bc1820a1ea93cb74e51326b86dbcc5c60e70aad
parent6565774d0356efc6225ad561bb13e7cf11da7b1e
parent702dbc0a247c149d53b52d1929f9880bc99d0522
Merge pull request #3730 from ceph/wip-firefly-flock

backport ceph-fuse file locking patches to Firefly

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