Merge pull request #10558 from cbodley/wip-rgw-mdlog-history

author Yehuda Sadeh <yehuda@redhat.com>

Tue, 4 Oct 2016 20:10:29 +0000 (13:10 -0700)

committer GitHub <noreply@github.com>

Tue, 4 Oct 2016 20:10:29 +0000 (13:10 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Tue, 4 Oct 2016 20:10:29 +0000 (13:10 -0700)
committer GitHub <noreply@github.com>
Tue, 4 Oct 2016 20:10:29 +0000 (13:10 -0700)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rest_log.cc
Simple merge
diff --cc src/rgw/rgw_sync.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Tue, 4 Oct 2016 20:10:29 +0000 (13:10 -0700)
committer	GitHub <noreply@github.com>
	Tue, 4 Oct 2016 20:10:29 +0000 (13:10 -0700)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_log.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync.cc	patch \|	diff1 \|	diff2 \|	blob \| history