Merge pull request #20015 from cbodley/wip-crypto--

author Sage Weil <sage@newdream.net>

Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)

committer GitHub <noreply@github.com>

Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)
author Sage Weil <sage@newdream.net>
Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)
committer GitHub <noreply@github.com>
Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)
diff --cc src/rgw/rgw_file.cc
Simple merge
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rest_swift.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)
committer	GitHub <noreply@github.com>
	Mon, 22 Jan 2018 23:48:20 +0000 (17:48 -0600)
		1	2
src/rgw/rgw_file.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_swift.cc	patch \|	diff1 \|	diff2 \|	blob \| history