Merge pull request #25541 from theanalyst/wip-es-log-fixes

author Abhishek L <abhishek.lekshmanan@gmail.com>

Wed, 2 Jan 2019 12:56:37 +0000 (13:56 +0100)

committer GitHub <noreply@github.com>

Wed, 2 Jan 2019 12:56:37 +0000 (13:56 +0100)
author Abhishek L <abhishek.lekshmanan@gmail.com>
Wed, 2 Jan 2019 12:56:37 +0000 (13:56 +0100)
committer GitHub <noreply@github.com>
Wed, 2 Jan 2019 12:56:37 +0000 (13:56 +0100)
diff --cc src/rgw/rgw_sync_module.cc
Simple merge
diff --cc src/rgw/rgw_sync_module_es.cc
Simple merge
author	Abhishek L <abhishek.lekshmanan@gmail.com>
	Wed, 2 Jan 2019 12:56:37 +0000 (13:56 +0100)
committer	GitHub <noreply@github.com>
	Wed, 2 Jan 2019 12:56:37 +0000 (13:56 +0100)
		1	2
src/rgw/rgw_sync_module.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync_module_es.cc	patch \|	diff1 \|	diff2 \|	blob \| history