Merge pull request #3392 from ceph/wip-crush-straw2

author Sage Weil <sage@redhat.com>

Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)

committer Sage Weil <sage@redhat.com>

Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)
author Sage Weil <sage@redhat.com>
Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)
committer Sage Weil <sage@redhat.com>
Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)
diff --cc src/mon/OSDMonitor.cc
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)
committer	Sage Weil <sage@redhat.com>
	Thu, 29 Jan 2015 21:03:39 +0000 (13:03 -0800)
		1	2
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history