Merge pull request #14133 from runsisi/wip-pg-state-cleanup

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)

committer GitHub <noreply@github.com>

Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)
committer GitHub <noreply@github.com>
Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)
diff --cc src/osd/OSD.h
Simple merge
diff --cc src/osd/PG.h
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)
committer	GitHub <noreply@github.com>
	Tue, 28 Mar 2017 16:24:02 +0000 (09:24 -0700)
		1	2
src/osd/OSD.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history