Merge pull request #1979 from ceph/wip-backfill-priority

author Sage Weil <sage@inktank.com>

Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)

committer Sage Weil <sage@inktank.com>

Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)
author Sage Weil <sage@inktank.com>
Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)
committer Sage Weil <sage@inktank.com>
Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Sage Weil <sage@inktank.com>
	Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)
committer	Sage Weil <sage@inktank.com>
	Mon, 23 Jun 2014 16:09:49 +0000 (09:09 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history