Merge pull request #4362 from XinzeChi/wip-tier-lat

author Sage Weil <sage@redhat.com>

Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)

committer Sage Weil <sage@redhat.com>

Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)
author Sage Weil <sage@redhat.com>
Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)
committer Sage Weil <sage@redhat.com>
Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)
committer	Sage Weil <sage@redhat.com>
	Fri, 1 May 2015 16:15:24 +0000 (09:15 -0700)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history