Merge pull request #12571 from athanatos/wip-15943

author Samuel Just <sjust@redhat.com>

Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)

committer GitHub <noreply@github.com>

Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)
author Samuel Just <sjust@redhat.com>
Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)
committer GitHub <noreply@github.com>
Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)
committer	GitHub <noreply@github.com>
	Mon, 19 Dec 2016 21:50:15 +0000 (13:50 -0800)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history