Merge pull request #18449 from dzafman/wip-zafman-misc

author David Zafman <dzafman@redhat.com>

Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)

committer GitHub <noreply@github.com>

Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)
author David Zafman <dzafman@redhat.com>
Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)
committer GitHub <noreply@github.com>
Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)
diff --cc src/osd/PGBackend.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	David Zafman <dzafman@redhat.com>
	Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)
committer	GitHub <noreply@github.com>
	Fri, 27 Oct 2017 17:21:25 +0000 (10:21 -0700)
		1	2
src/osd/PGBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history