From: Sage Weil <sage@redhat.com>
Date: Fri, 15 Apr 2016 21:14:39 +0000 (-0400)
Subject: Merge pull request #8545 from xiexingguo/xxg-wip-lfn
X-Git-Tag: v10.2.0~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4848559819b3675ca10c0037e6d97a69eb2dba19;p=ceph.git

Merge pull request #8545 from xiexingguo/xxg-wip-lfn

os/filestore: fix return type mismatch for lfn parse

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
---

4848559819b3675ca10c0037e6d97a69eb2dba19