Merge pull request #12844 from athanatos/wip-17831

author Samuel Just <sjust@redhat.com>

Sun, 15 Jan 2017 02:48:00 +0000 (18:48 -0800)

committer GitHub <noreply@github.com>

Sun, 15 Jan 2017 02:48:00 +0000 (18:48 -0800)
author Samuel Just <sjust@redhat.com>
Sun, 15 Jan 2017 02:48:00 +0000 (18:48 -0800)
committer GitHub <noreply@github.com>
Sun, 15 Jan 2017 02:48:00 +0000 (18:48 -0800)
diff --cc src/osd/PGBackend.h
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
diff --cc src/osd/ReplicatedBackend.h
Simple merge
author	Samuel Just <sjust@redhat.com>
	Sun, 15 Jan 2017 02:48:00 +0000 (18:48 -0800)
committer	GitHub <noreply@github.com>
	Sun, 15 Jan 2017 02:48:00 +0000 (18:48 -0800)
		1	2
src/osd/PGBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.h	patch \|	diff1 \|	diff2 \|	blob \| history