Merge pull request #11388 from ukernel/wip-17177

author Yuri Weinstein <yuri.weinstein@gmail.com>

Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)

committer GitHub <noreply@github.com>

Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)
committer GitHub <noreply@github.com>
Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)
diff --cc src/os/filestore/FileStore.cc
Simple merge
diff --cc src/os/filestore/FileStore.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)
committer	GitHub <noreply@github.com>
	Mon, 24 Oct 2016 21:44:04 +0000 (14:44 -0700)
		1	2
src/os/filestore/FileStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/filestore/FileStore.h	patch \|	diff1 \|	diff2 \|	blob \| history