Merge pull request #5463 from kylinstorage/wip-evict_ops

author Kefu Chai <tchaikov@gmail.com>

Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
author Kefu Chai <tchaikov@gmail.com>
Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Tue, 8 Sep 2015 09:29:29 +0000 (17:29 +0800)
		1	2
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history