Merge pull request #18987 from ivancich/wip-remove-sys-obj-get-state

author Casey Bodley <cbodley@users.noreply.github.com>

Mon, 20 Nov 2017 15:48:01 +0000 (10:48 -0500)

committer GitHub <noreply@github.com>

Mon, 20 Nov 2017 15:48:01 +0000 (10:48 -0500)
author Casey Bodley <cbodley@users.noreply.github.com>
Mon, 20 Nov 2017 15:48:01 +0000 (10:48 -0500)
committer GitHub <noreply@github.com>
Mon, 20 Nov 2017 15:48:01 +0000 (10:48 -0500)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Casey Bodley <cbodley@users.noreply.github.com>
	Mon, 20 Nov 2017 15:48:01 +0000 (10:48 -0500)
committer	GitHub <noreply@github.com>
	Mon, 20 Nov 2017 15:48:01 +0000 (10:48 -0500)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history