Merge pull request #1813 from ceph/wip-old-out

author Samuel Just <sam.just@inktank.com>

Tue, 27 May 2014 22:06:34 +0000 (15:06 -0700)

committer Samuel Just <sam.just@inktank.com>

Tue, 27 May 2014 22:06:34 +0000 (15:06 -0700)
author Samuel Just <sam.just@inktank.com>
Tue, 27 May 2014 22:06:34 +0000 (15:06 -0700)
committer Samuel Just <sam.just@inktank.com>
Tue, 27 May 2014 22:06:34 +0000 (15:06 -0700)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Tue, 27 May 2014 22:06:34 +0000 (15:06 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Tue, 27 May 2014 22:06:34 +0000 (15:06 -0700)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history