Merge pull request #24014 from yehudasa/wip-rgw-svc-2

author Yehuda Sadeh <yehuda@redhat.com>

Thu, 8 Nov 2018 22:00:51 +0000 (14:00 -0800)

committer GitHub <noreply@github.com>

Thu, 8 Nov 2018 22:00:51 +0000 (14:00 -0800)
author Yehuda Sadeh <yehuda@redhat.com>
Thu, 8 Nov 2018 22:00:51 +0000 (14:00 -0800)
committer GitHub <noreply@github.com>
Thu, 8 Nov 2018 22:00:51 +0000 (14:00 -0800)
diff --cc src/include/rados/librados.hpp
Simple merge
diff --cc src/librados/librados_cxx.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Thu, 8 Nov 2018 22:00:51 +0000 (14:00 -0800)
committer	GitHub <noreply@github.com>
	Thu, 8 Nov 2018 22:00:51 +0000 (14:00 -0800)
		1	2
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados/librados_cxx.cc	patch \|	diff1 \|	diff2 \|	blob \| history