Merge pull request #13542 from shinobu-x/wip-18929-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Thu, 6 Jul 2017 07:18:24 +0000 (09:18 +0200)

committer GitHub <noreply@github.com>

Thu, 6 Jul 2017 07:18:24 +0000 (09:18 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Thu, 6 Jul 2017 07:18:24 +0000 (09:18 +0200)
committer GitHub <noreply@github.com>
Thu, 6 Jul 2017 07:18:24 +0000 (09:18 +0200)
diff --cc src/osd/PG.cc
Simple merge
diff --cc src/osd/PG.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Thu, 6 Jul 2017 07:18:24 +0000 (09:18 +0200)
committer	GitHub <noreply@github.com>
	Thu, 6 Jul 2017 07:18:24 +0000 (09:18 +0200)
		1	2
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.h	patch \|	diff1 \|	diff2 \|	blob \| history