Merge pull request #18145 from dzafman/wip-18162

author Josh Durgin <jdurgin@redhat.com>

Thu, 19 Oct 2017 00:33:12 +0000 (17:33 -0700)

committer GitHub <noreply@github.com>

Thu, 19 Oct 2017 00:33:12 +0000 (17:33 -0700)
author Josh Durgin <jdurgin@redhat.com>
Thu, 19 Oct 2017 00:33:12 +0000 (17:33 -0700)
committer GitHub <noreply@github.com>
Thu, 19 Oct 2017 00:33:12 +0000 (17:33 -0700)
diff --cc src/mon/PGMap.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Thu, 19 Oct 2017 00:33:12 +0000 (17:33 -0700)
committer	GitHub <noreply@github.com>
	Thu, 19 Oct 2017 00:33:12 +0000 (17:33 -0700)
		1	2
src/mon/PGMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history