Merge pull request #11213 from liewegas/wip-osd-fastinfo

author Sage Weil <sage@redhat.com>

Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)

committer GitHub <noreply@github.com>

Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)
author Sage Weil <sage@redhat.com>
Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)
committer GitHub <noreply@github.com>
Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)
committer	GitHub <noreply@github.com>
	Wed, 19 Oct 2016 02:39:58 +0000 (21:39 -0500)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history