Merge pull request #11249 from wido/osd-flush-journal-shutdown

author Sage Weil <sage@redhat.com>

Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)

committer GitHub <noreply@github.com>

Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)
author Sage Weil <sage@redhat.com>
Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)
committer GitHub <noreply@github.com>
Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)
committer	GitHub <noreply@github.com>
	Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history