Merge pull request #8772 from yehudasa/wip-15625

author Yehuda Sadeh <yehuda@redhat.com>

Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)

committer Yehuda Sadeh <yehuda@redhat.com>

Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)
committer Yehuda Sadeh <yehuda@redhat.com>
Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
diff --cc src/rgw/rgw_rest_client.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)
committer	Yehuda Sadeh <yehuda@redhat.com>
	Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_client.cc	patch \|	diff1 \|	diff2 \|	blob \| history