Merge pull request #12059 from liewegas/wip-osd-omap-limits

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

Wed, 23 Nov 2016 00:34:54 +0000 (16:34 -0800)

committer GitHub <noreply@github.com>

Wed, 23 Nov 2016 00:34:54 +0000 (16:34 -0800)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Wed, 23 Nov 2016 00:34:54 +0000 (16:34 -0800)
committer GitHub <noreply@github.com>
Wed, 23 Nov 2016 00:34:54 +0000 (16:34 -0800)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedPG.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Wed, 23 Nov 2016 00:34:54 +0000 (16:34 -0800)
committer	GitHub <noreply@github.com>
	Wed, 23 Nov 2016 00:34:54 +0000 (16:34 -0800)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history