Merge pull request #5051 from SUSE/wip-12016-firefly

author Loic Dachary <loic@dachary.org>

Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)

committer Loic Dachary <loic@dachary.org>

Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)
author Loic Dachary <loic@dachary.org>
Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)
committer Loic Dachary <loic@dachary.org>
Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)
committer	Loic Dachary <loic@dachary.org>
	Fri, 24 Jul 2015 08:49:50 +0000 (10:49 +0200)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history