Merge pull request #1973 from ceph/wip-8593

author Sage Weil <sage@inktank.com>

Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)

committer Sage Weil <sage@inktank.com>

Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)
author Sage Weil <sage@inktank.com>
Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)
committer Sage Weil <sage@inktank.com>
Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)
diff --cc src/mon/Monitor.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)
committer	Sage Weil <sage@inktank.com>
	Wed, 25 Jun 2014 17:55:25 +0000 (10:55 -0700)
		1	2
src/mon/Monitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history