Merge pull request #18959 from cooboos/wip-cephdencoder-LCtype

author Kefu Chai <tchaikov@gmail.com>

Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)

committer GitHub <noreply@github.com>

Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)
author Kefu Chai <tchaikov@gmail.com>
Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)
committer GitHub <noreply@github.com>
Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)
diff --cc src/rgw/rgw_json_enc.cc
Simple merge
diff --cc src/test/encoding/types.h
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)
committer	GitHub <noreply@github.com>
	Wed, 29 Nov 2017 08:10:46 +0000 (16:10 +0800)
		1	2
src/rgw/rgw_json_enc.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/encoding/types.h	patch \|	diff1 \|	diff2 \|	blob \| history