Merge pull request #11204 from liewegas/wip-rados-ack

author Sage Weil <sage@redhat.com>

Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)

committer GitHub <noreply@github.com>

Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)
author Sage Weil <sage@redhat.com>
Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)
committer GitHub <noreply@github.com>
Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_metadata.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Sage Weil <sage@redhat.com>
	Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)
committer	GitHub <noreply@github.com>
	Wed, 19 Oct 2016 02:40:44 +0000 (21:40 -0500)
		1	2
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_metadata.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history