Merge remote-tracking branch 'origin/master' into slurm_zj

# Conflicts:
#	README.md
#	adaptor/pcm_pod/gen/idl/pod.pb.go
#	adaptor/pcm_pod/gen/idl/pod.pb.gw.go
#	adaptor/pcm_vm/gen/idl/ecs.pb.gw.go
#	adaptor/pcm_vm/gen/idl/ecs_grpc.pb.go
#	adaptor/pcm_vm/gen/openapiv2/idl/ecs.swagger.json
#	adaptor/pcm_vm/idl/ecs.proto
#	adaptor/pcm_vm/server/ecsImpl.go
#	adaptor/pcm_vm/service/harvester.go
#	common/server/server_ecs.go
#	lan_trans/idl/demo/demo.pb.go
#	lan_trans/idl/demo/demo.pb.gw.go
#	lan_trans/idl/pbecs/ecs.pb.go
#	lan_trans/openapiv2/idl/demo/demo.swagger.json
#	lan_trans/openapiv2/idl/pbpod/pod.swagger.json
#	tenant/gen/idl/tenant.pb.go
This commit is contained in:
zhouqunjie 2022-10-24 23:50:23 -07:00
commit 7825703a07
1 changed files with 6 additions and 3 deletions

View File

@ -15,11 +15,14 @@
"protobufAny": {
"type": "object",
"properties": {
"@type": {
"typeUrl": {
"type": "string"
},
"value": {
"type": "string",
"format": "byte"
}
},
"additionalProperties": {}
}
},
"rpcStatus": {
"type": "object",