Merge pull request #3381 from liewegas/wip-pg-stat-updates

author Sage Weil <sage@redhat.com>

Wed, 21 Jan 2015 21:53:16 +0000 (13:53 -0800)

committer Sage Weil <sage@redhat.com>

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