Merge pull request #14735 from smithfarm/wip-19685-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 5 Jul 2017 19:59:03 +0000 (21:59 +0200)

committer GitHub <noreply@github.com>

Wed, 5 Jul 2017 19:59:03 +0000 (21:59 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 5 Jul 2017 19:59:03 +0000 (21:59 +0200)
committer GitHub <noreply@github.com>
Wed, 5 Jul 2017 19:59:03 +0000 (21:59 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/PG.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 5 Jul 2017 19:59:03 +0000 (21:59 +0200)
committer	GitHub <noreply@github.com>
	Wed, 5 Jul 2017 19:59:03 +0000 (21:59 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PG.cc	patch \|	diff1 \|	diff2 \|	blob \| history