Merge pull request #19850 from dzafman/wip-calc-stats

author David Zafman <dzafman@redhat.com>

Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)

committer GitHub <noreply@github.com>

Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)
author David Zafman <dzafman@redhat.com>
Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)
committer GitHub <noreply@github.com>
Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	David Zafman <dzafman@redhat.com>
	Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)
committer	GitHub <noreply@github.com>
	Tue, 16 Jan 2018 19:58:49 +0000 (11:58 -0800)
		1	2
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history