Code

Merge: 3.6.x->master#1274

Code

Merged

jsonwan merged 8 commits intoTencentBlueKing:masterTencentBlueKing/bk-job:masterfrom jsonwan:masterjsonwan/bk-job:masterCopy head branch name to clipboardSep 9, 2022

+17-13

Commits

Commits on Sep 9, 2022

• Merge pull request TencentBlueKing#1266 from hLinx/3.5.x

  Show description for 349d7a1
  hLinx

  authored
  349d7a1

  Copy full SHA for 349d7a1

• Merge pull request TencentBlueKing#1267 from hLinx/3.5.x

  Show description for bc172e4
  hLinx

  authored
  bc172e4

  Copy full SHA for bc172e4

• chore: 去除代码中的chart与镜像版本信息，避免多版本合代码时的冲突 TencentBlueKing#1268

  Show description for 5b1fad8
  jsonwan

  committed
  5b1fad8

  Copy full SHA for 5b1fad8

• chore: 去除代码中的chart与镜像版本信息，避免多版本合代码时的冲突 TencentBlueKing#1268

  Show description for 9ca1967
  jsonwan

  committed
  9ca1967

  Copy full SHA for 9ca1967

• Merge pull request TencentBlueKing#1271 from jsonwan/github_chore/version

  Show description for c9d81f2
  wangyu096

  authored
  c9d81f2

  Copy full SHA for c9d81f2

• Merge branch '3.6.x' into 3.5.x

  jsonwan

  authored
  7d1a342

  Copy full SHA for 7d1a342

• Merge pull request TencentBlueKing#1273 from Tencent/3.5.x

  Show description for e35c971
  jsonwan

  authored
  e35c971

  Copy full SHA for e35c971

• Merge branch '3.6.x' into github_master

  jsonwan

  committed
  7918897

  Copy full SHA for 7918897