Merge pull request #7890 from liewegas/wip-reweight

author Sage Weil <sage@redhat.com>

Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)

committer Sage Weil <sage@redhat.com>

Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)
author Sage Weil <sage@redhat.com>
Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)
committer Sage Weil <sage@redhat.com>
Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)
diff --cc qa/workunits/cephtool/test.sh
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSDMap.cc
Simple merge
diff --cc src/osd/OSDMap.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)
committer	Sage Weil <sage@redhat.com>
	Wed, 9 Mar 2016 19:06:30 +0000 (14:06 -0500)
		1	2
qa/workunits/cephtool/test.sh	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSDMap.h	patch \|	diff1 \|	diff2 \|	blob \| history