Merge pull request #12578 from kylinstorage/wip-filestore-ref

author Sage Weil <sage@newdream.net>

Mon, 13 Mar 2017 19:55:26 +0000 (14:55 -0500)

committer GitHub <noreply@github.com>

Mon, 13 Mar 2017 19:55:26 +0000 (14:55 -0500)
author Sage Weil <sage@newdream.net>
Mon, 13 Mar 2017 19:55:26 +0000 (14:55 -0500)
committer GitHub <noreply@github.com>
Mon, 13 Mar 2017 19:55:26 +0000 (14:55 -0500)
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/os/filestore/FileStore.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 13 Mar 2017 19:55:26 +0000 (14:55 -0500)
committer	GitHub <noreply@github.com>
	Mon, 13 Mar 2017 19:55:26 +0000 (14:55 -0500)
		1	2
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.h	patch \|	diff1 \|	diff2 \|	blob \| history