Merge pull request #16617 from dillaman/wip-20783

author Josh Durgin <jdurgin@redhat.com>

Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)

committer GitHub <noreply@github.com>

Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)
author Josh Durgin <jdurgin@redhat.com>
Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)
committer GitHub <noreply@github.com>
Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Josh Durgin <jdurgin@redhat.com>
	Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)
committer	GitHub <noreply@github.com>
	Fri, 28 Jul 2017 22:07:17 +0000 (15:07 -0700)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history