Commit Graph

5 Commits

Author SHA1 Message Date
zhouqunjie 635b52b5c8 Update config_template.yaml 2022-04-05 16:25:43 +08:00
devad 55d71ebab1 Merge branch 'master' into protobuf
# Conflicts:
#	adaptor/container_api_adaptor/common/main.go
#	adaptor/container_api_adaptor/huawei/pkg/auth/aksk/aksk.go
#	adaptor/pod_adaptor/server/pod/list.go
#	adaptor/pod_adaptor/service/poder/poder.go
#	common/server/server.go
#	common/server/server_pod.go
#	idl/pbpod/pod.proto
#	lan_trans/idl/pbpod/pod.pb.go
#	lan_trans/idl/pbpod/pod.pb.gw.go
#	lan_trans/idl/pbpod/pod_grpc.pb.go
#	lan_trans/openapiv2/idl/demo/demo.swagger.json
#	lan_trans/openapiv2/idl/pbecs/ecs.swagger.json
#	lan_trans/openapiv2/idl/pbpod/pod.swagger.json
#	lan_trans/openapiv2/idl/pbtenant/tenant.swagger.json
#	main.go
2022-04-05 15:24:07 +08:00
zhouqunjie 3317bc7404 refactor 2022-04-04 17:36:54 +08:00
devad bd3c8e71e5 refactor
Signed-off-by: devad <cossjie@foxmail.com>
2022-04-02 18:19:56 +08:00
zhouqunjie 42e11cd2d6 refactor 2022-04-02 16:35:43 +08:00