Merge pull request #3527 from wonzhq/op-stat

author Sage Weil <sage@redhat.com>

Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)

committer Sage Weil <sage@redhat.com>

Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)
author Sage Weil <sage@redhat.com>
Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)
committer Sage Weil <sage@redhat.com>
Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/ReplicatedPG.h
Simple merge
author	Sage Weil <sage@redhat.com>
	Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)
committer	Sage Weil <sage@redhat.com>
	Sat, 31 Jan 2015 21:16:15 +0000 (13:16 -0800)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.h	patch \|	diff1 \|	diff2 \|	blob \| history