Merge pull request #16299 from smithfarm/wip-20262-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Tue, 12 Sep 2017 07:36:50 +0000 (09:36 +0200)

committer GitHub <noreply@github.com>

Tue, 12 Sep 2017 07:36:50 +0000 (09:36 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Tue, 12 Sep 2017 07:36:50 +0000 (09:36 +0200)
committer GitHub <noreply@github.com>
Tue, 12 Sep 2017 07:36:50 +0000 (09:36 +0200)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_bucket.cc
Simple merge
diff --cc src/rgw/rgw_metadata.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Tue, 12 Sep 2017 07:36:50 +0000 (09:36 +0200)
committer	GitHub <noreply@github.com>
	Tue, 12 Sep 2017 07:36:50 +0000 (09:36 +0200)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_metadata.cc	patch \|	diff1 \|	diff2 \|	blob \| history