Merge pull request #5823 from SUSE/wip-11700-firefly

author Loic Dachary <loic@dachary.org>

Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)

committer Loic Dachary <loic@dachary.org>

Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
author Loic Dachary <loic@dachary.org>
Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
committer Loic Dachary <loic@dachary.org>
Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
committer	Loic Dachary <loic@dachary.org>
	Fri, 23 Oct 2015 19:47:27 +0000 (21:47 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history