Merge pull request #15966 from prallabh/jewel

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 6 Sep 2017 07:36:13 +0000 (09:36 +0200)

committer GitHub <noreply@github.com>

Wed, 6 Sep 2017 07:36:13 +0000 (09:36 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 6 Sep 2017 07:36:13 +0000 (09:36 +0200)
committer GitHub <noreply@github.com>
Wed, 6 Sep 2017 07:36:13 +0000 (09:36 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 6 Sep 2017 07:36:13 +0000 (09:36 +0200)
committer	GitHub <noreply@github.com>
	Wed, 6 Sep 2017 07:36:13 +0000 (09:36 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history