Merge pull request #6649 from majianpeng/filesstore-lfnunlink

author Sage Weil <sage@redhat.com>

Fri, 1 Jan 2016 14:49:52 +0000 (09:49 -0500)

committer Sage Weil <sage@redhat.com>

Fri, 1 Jan 2016 14:49:52 +0000 (09:49 -0500)
author Sage Weil <sage@redhat.com>
Fri, 1 Jan 2016 14:49:52 +0000 (09:49 -0500)
committer Sage Weil <sage@redhat.com>
Fri, 1 Jan 2016 14:49:52 +0000 (09:49 -0500)
diff --cc src/os/FileStore.cc
Simple merge
diff --cc src/os/HashIndex.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 1 Jan 2016 14:49:52 +0000 (09:49 -0500)
committer	Sage Weil <sage@redhat.com>
	Fri, 1 Jan 2016 14:49:52 +0000 (09:49 -0500)
		1	2
src/os/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/HashIndex.h	patch \|	diff1 \|	diff2 \|	blob \| history