]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21615 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Fri, 11 May 2018 21:57:54 +0000 (14:57 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Fri, 11 May 2018 21:57:54 +0000 (14:57 -0700)
* refs/pull/21615/head:
ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail

Reviewed-by: Zheng Yan <zyan@redhat.com>
1  2 
src/client/Client.cc

Simple merge