Merge pull request #13232 from ovh/wip-rework-recovery-priorities-jewel

author Ken Dreyer <kdreyer@redhat.com>

Tue, 28 Mar 2017 21:53:49 +0000 (15:53 -0600)

committer Ken Dreyer <kdreyer@redhat.com>

Tue, 28 Mar 2017 21:57:39 +0000 (15:57 -0600)
author Ken Dreyer <kdreyer@redhat.com>
Tue, 28 Mar 2017 21:53:49 +0000 (15:53 -0600)
committer Ken Dreyer <kdreyer@redhat.com>
Tue, 28 Mar 2017 21:57:39 +0000 (15:57 -0600)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Ken Dreyer <kdreyer@redhat.com>
	Tue, 28 Mar 2017 21:53:49 +0000 (15:53 -0600)
committer	Ken Dreyer <kdreyer@redhat.com>
	Tue, 28 Mar 2017 21:57:39 +0000 (15:57 -0600)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history