Merge pull request #11497 from rzarzynski/wip-rgw-slashinfo-jewel

author Nathan Cutler <presnypreklad@gmail.com>

Wed, 1 Feb 2017 14:21:33 +0000 (15:21 +0100)

committer GitHub <noreply@github.com>

Wed, 1 Feb 2017 14:21:33 +0000 (15:21 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Wed, 1 Feb 2017 14:21:33 +0000 (15:21 +0100)
committer GitHub <noreply@github.com>
Wed, 1 Feb 2017 14:21:33 +0000 (15:21 +0100)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_rest.cc
Simple merge
diff --cc src/rgw/rgw_swift_auth.cc
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Wed, 1 Feb 2017 14:21:33 +0000 (15:21 +0100)
committer	GitHub <noreply@github.com>
	Wed, 1 Feb 2017 14:21:33 +0000 (15:21 +0100)
		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_rest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_swift_auth.cc	patch \|	diff1 \|	diff2 \|	blob \| history