Merge pull request #9894 from gaowanlong/osd_recovery_max_omap_entries_per_chunk

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

Tue, 26 Jul 2016 22:38:10 +0000 (15:38 -0700)

committer GitHub <noreply@github.com>

Tue, 26 Jul 2016 22:38:10 +0000 (15:38 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 26 Jul 2016 22:38:10 +0000 (15:38 -0700)
committer GitHub <noreply@github.com>
Tue, 26 Jul 2016 22:38:10 +0000 (15:38 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/osd/ReplicatedBackend.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 26 Jul 2016 22:38:10 +0000 (15:38 -0700)
committer	GitHub <noreply@github.com>
	Tue, 26 Jul 2016 22:38:10 +0000 (15:38 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/ReplicatedBackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history