From: Dan Mick <dan.mick@redhat.com>
Date: Mon, 27 Jun 2016 20:33:27 +0000 (-0700)
Subject: Merge pull request #1020 from ceph/wip-15563-master
X-Git-Tag: v11.1.1~58^2^2~156
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3dc18691a1a7fafeb21ac565ced0809cee78a40b;p=ceph.git

Merge pull request #1020 from ceph/wip-15563-master

Added file locking logic to avoid possible collisions …

Reviewed-by: Dan Mick <dmick@redhat.com>
---

3dc18691a1a7fafeb21ac565ced0809cee78a40b