Merge pull request #27931 from yuvalif/pubsub_info_update_fix

author Yuval Lifshitz <yuvalif@yahoo.com>

Tue, 7 May 2019 09:18:53 +0000 (12:18 +0300)

committer GitHub <noreply@github.com>

Tue, 7 May 2019 09:18:53 +0000 (12:18 +0300)
author Yuval Lifshitz <yuvalif@yahoo.com>
Tue, 7 May 2019 09:18:53 +0000 (12:18 +0300)
committer GitHub <noreply@github.com>
Tue, 7 May 2019 09:18:53 +0000 (12:18 +0300)
diff --cc src/rgw/services/svc_sys_obj_core.h
Simple merge
diff --cc src/test/rgw/rgw_multi/tests_ps.py
Simple merge
diff --cc src/test/rgw/rgw_multi/zone_ps.py
Simple merge
author	Yuval Lifshitz <yuvalif@yahoo.com>
	Tue, 7 May 2019 09:18:53 +0000 (12:18 +0300)
committer	GitHub <noreply@github.com>
	Tue, 7 May 2019 09:18:53 +0000 (12:18 +0300)
		1	2
src/rgw/services/svc_sys_obj_core.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/rgw/rgw_multi/tests_ps.py	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/rgw/rgw_multi/zone_ps.py	patch \|	diff1 \|	diff2 \|	blob \| history