Merge pull request #6402 from SUSE/wip-13621-hammer

author Loic Dachary <loic@dachary.org>

Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)

committer Loic Dachary <loic@dachary.org>

Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)
author Loic Dachary <loic@dachary.org>
Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)
committer Loic Dachary <loic@dachary.org>
Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)
committer	Loic Dachary <loic@dachary.org>
	Tue, 17 Nov 2015 09:24:45 +0000 (10:24 +0100)
		1	2
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history