Merge pull request #10886 from dachary/wip-17144-jewel

author Loic Dachary <loic@dachary.org>

Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)

committer GitHub <noreply@github.com>

Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)
author Loic Dachary <loic@dachary.org>
Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)
committer GitHub <noreply@github.com>
Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)
committer	GitHub <noreply@github.com>
	Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history