Merge pull request #8044 from dzafman/wip-8885

author Sage Weil <sage@redhat.com>

Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)

committer Sage Weil <sage@redhat.com>

Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)
author Sage Weil <sage@redhat.com>
Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)
committer Sage Weil <sage@redhat.com>
Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)
committer	Sage Weil <sage@redhat.com>
	Fri, 25 Mar 2016 13:53:56 +0000 (09:53 -0400)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history