Merge pull request #13342 from athanatos/wip-17831-18583-18809

author Samuel Just <sjust@redhat.com>

Fri, 10 Feb 2017 19:18:02 +0000 (11:18 -0800)

committer GitHub <noreply@github.com>

Fri, 10 Feb 2017 19:18:02 +0000 (11:18 -0800)
author Samuel Just <sjust@redhat.com>
Fri, 10 Feb 2017 19:18:02 +0000 (11:18 -0800)
committer GitHub <noreply@github.com>
Fri, 10 Feb 2017 19:18:02 +0000 (11:18 -0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
author	Samuel Just <sjust@redhat.com>
	Fri, 10 Feb 2017 19:18:02 +0000 (11:18 -0800)
committer	GitHub <noreply@github.com>
	Fri, 10 Feb 2017 19:18:02 +0000 (11:18 -0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history