Merge pull request #4925 from XinzeChi/wip-hit-set-size

author Kefu Chai <tchaikov@gmail.com>

Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)

committer Kefu Chai <tchaikov@gmail.com>

Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)
committer Kefu Chai <tchaikov@gmail.com>
Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)
committer	Kefu Chai <tchaikov@gmail.com>
	Wed, 9 Sep 2015 04:44:21 +0000 (12:44 +0800)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history