Merge branch '1.4.x' into 1.5.x

author 刘洪青 <hongqing.liu@supwisdom.com>

Fri, 20 May 2022 15:37:30 +0000 (23:37 +0800)

committer 刘洪青 <hongqing.liu@supwisdom.com>

Fri, 20 May 2022 15:37:30 +0000 (23:37 +0800)
author 刘洪青 <hongqing.liu@supwisdom.com>
Fri, 20 May 2022 15:37:30 +0000 (23:37 +0800)
committer 刘洪青 <hongqing.liu@supwisdom.com>
Fri, 20 May 2022 15:37:30 +0000 (23:37 +0800)
diff --cc deploy-manifests/k8s-rancher/1.authx-service/10.0.(废弃)init.sql
Simple merge
diff --cc deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml
Simple merge
diff --cc deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml
Simple merge
diff --cc deploy-manifests/k8s-rancher/1.authx-service/8.authx-log/4.2.authx-log-sa.yaml
Simple merge
author	刘洪青 <hongqing.liu@supwisdom.com>
	Fri, 20 May 2022 15:37:30 +0000 (23:37 +0800)
committer	刘洪青 <hongqing.liu@supwisdom.com>
	Fri, 20 May 2022 15:37:30 +0000 (23:37 +0800)
		1	2
deploy-manifests/k8s-rancher/1.authx-service/10.0.(废弃)init.sql	patch \|	diff1 \|	diff2 \|	blob \| history
deploy-manifests/k8s-rancher/1.authx-service/4.cas-server/4.2.cas-server-sa-api.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy-manifests/k8s-rancher/1.authx-service/5.token-server/4.1.token-server.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
deploy-manifests/k8s-rancher/1.authx-service/8.authx-log/4.2.authx-log-sa.yaml	patch \|	diff1 \|	diff2 \|	blob \| history