Merge pull request #1313 from ceph/dumpling-osd-subscribe

author Sage Weil <sage@inktank.com>

Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)

committer Sage Weil <sage@inktank.com>

Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
author Sage Weil <sage@inktank.com>
Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
committer Sage Weil <sage@inktank.com>
Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
diff --cc src/mon/MonClient.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
author	Sage Weil <sage@inktank.com>
	Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
committer	Sage Weil <sage@inktank.com>
	Fri, 21 Mar 2014 21:53:23 +0000 (14:53 -0700)
		1	2
src/mon/MonClient.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history