Merge pull request #8560 from liewegas/wip-lfn-startup

author Sage Weil <sage@redhat.com>

Fri, 15 Apr 2016 21:16:45 +0000 (17:16 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 15 Apr 2016 21:16:45 +0000 (17:16 -0400)
author Sage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:16:45 +0000 (17:16 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 15 Apr 2016 21:16:45 +0000 (17:16 -0400)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/vstart.sh
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 15 Apr 2016 21:16:45 +0000 (17:16 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 15 Apr 2016 21:16:45 +0000 (17:16 -0400)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/vstart.sh	patch \|	diff1 \|	diff2 \|	blob \| history