Merge pull request #7201 from ErwanAliasr1/evelu-cleanup-deadstuff

author Sage Weil <sage@redhat.com>

Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)
author Sage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)
diff --cc src/mon/PGMonitor.cc
Simple merge
diff --cc src/os/bluestore/BlueStore.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 27 Jan 2016 18:13:47 +0000 (13:13 -0500)
		1	2
src/mon/PGMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/os/bluestore/BlueStore.cc	patch \|	diff1 \|	diff2 \|	blob \| history