Merge pull request #8464 from dzafman/wip-13039-15315

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)

committer GitHub <noreply@github.com>

Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
committer GitHub <noreply@github.com>
Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
diff --cc src/osd/OSD.cc
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
committer	GitHub <noreply@github.com>
	Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)
		1	2
src/osd/OSD.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history