Merge pull request #12888 from athanatos/wip-18165

author Sage Weil <sage@redhat.com>

Thu, 12 Jan 2017 20:17:58 +0000 (14:17 -0600)

committer GitHub <noreply@github.com>

Thu, 12 Jan 2017 20:17:58 +0000 (14:17 -0600)
author Sage Weil <sage@redhat.com>
Thu, 12 Jan 2017 20:17:58 +0000 (14:17 -0600)
committer GitHub <noreply@github.com>
Thu, 12 Jan 2017 20:17:58 +0000 (14:17 -0600)
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 12 Jan 2017 20:17:58 +0000 (14:17 -0600)
committer	GitHub <noreply@github.com>
	Thu, 12 Jan 2017 20:17:58 +0000 (14:17 -0600)
		1	2
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history