Merge remote-tracking branch 'gh/jewel'

author Sage Weil <sage@redhat.com>

Wed, 3 Feb 2016 14:46:47 +0000 (09:46 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 3 Feb 2016 14:46:47 +0000 (09:46 -0500)
author Sage Weil <sage@redhat.com>
Wed, 3 Feb 2016 14:46:47 +0000 (09:46 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 3 Feb 2016 14:46:47 +0000 (09:46 -0500)
diff --cc src/mon/MDSMonitor.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 3 Feb 2016 14:46:47 +0000 (09:46 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 3 Feb 2016 14:46:47 +0000 (09:46 -0500)
		1	2
src/mon/MDSMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history