Merge pull request #18116 from linuxbox2/jewel-mpserializer

author Nathan Cutler <presnypreklad@gmail.com>

Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)

committer GitHub <noreply@github.com>

Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)
author Nathan Cutler <presnypreklad@gmail.com>
Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)
committer GitHub <noreply@github.com>
Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)
diff --cc src/rgw/rgw_op.cc
Simple merge
diff --cc src/rgw/rgw_op.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)
committer	GitHub <noreply@github.com>
	Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)
		1	2
src/rgw/rgw_op.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	patch \|	diff1 \|	diff2 \|	blob \| history