zhangwei
|
83fa3218ab
|
Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
# Conflicts:
# api/internal/cron/cron.go
# api/internal/scheduler/database/aiStorage.go
Former-commit-id: 30a9579debd6cd3803bd423c958d0b670625cc7c
|
2024-06-11 09:05:45 +08:00 |
|
zhangwei
|
8ba618bfdd
|
移除多余代码
Former-commit-id: 94004d05b18036a47773a3d4906aceb86e61e142
|
2024-06-11 09:03:53 +08:00 |
tzwang
|
9cd2e072b2
|
Merge pull request 'fix noticeinfo bugs' (#221) from tzwang/pcm-coordinator:master into master
Former-commit-id: 738c04b5d90c9ca6445f30d057fa4fc9773696e6
|
2024-06-07 18:55:57 +08:00 |
|
tzwang
|
b0de44251b
|
fix noticeinfo bugs
Former-commit-id: fb2dfbd4d7f0beafd92a783868504536f7cda644
|
2024-06-07 18:52:24 +08:00 |
|
tzwang
|
4b2087311a
|
Merge pull request 'fix bugs' (#220) from tzwang/pcm-coordinator:master into master
Former-commit-id: 818b7110f1819bdbcf529f251500364ce585126a
|
2024-06-07 14:55:07 +08:00 |
|
tzwang
|
ed6cf043d0
|
fix clusterResouces bugs
Former-commit-id: 4a96ca733136179cca1284f3b68a7aa59bd98d8e
|
2024-06-07 14:51:48 +08:00 |
|
tzwang
|
11e01683a2
|
Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: 7b49a92d6af20441eb109b7340f15f8e61400d8b
|
2024-06-07 14:48:30 +08:00 |
|
tzwang
|
813e25fb3b
|
fix clusterResouces bugs
Former-commit-id: d9dc30e4262df90c75bdbb5c671f296915fae1a7
|
2024-06-07 14:48:16 +08:00 |
qiwang
|
e84cb0463b
|
Merge pull request 'update vminfo 0607' (#219) from master-wq into master
Former-commit-id: d60022f2e54be7f47663beb993062940d4021222
|
2024-06-07 11:00:48 +08:00 |
|
tzwang
|
8bd0fcac07
|
Merge pull request 'fix clusterResouces bugs' (#218) from tzwang/pcm-coordinator:master into master
Former-commit-id: 065653b186be3b52ac45b2b5f36f3e574b501b38
|
2024-06-07 10:48:41 +08:00 |
|
tzwang
|
226fd9a7bd
|
fix clusterResouces bugs
Former-commit-id: 390a0d67629c0bb7f8c0dee0cf329c2958248aa5
|
2024-06-07 10:45:26 +08:00 |
|
tzwang
|
7bfbed0ce9
|
Merge pull request 'fix clusterResouces bugs' (#217) from tzwang/pcm-coordinator:master into master
Former-commit-id: dd2de7fa06b567190ee40dbe20b58188d4c4af25
|
2024-06-07 10:42:39 +08:00 |
|
tzwang
|
e53e9d5800
|
fix clusterResouces bugs
Former-commit-id: da9b51cd929ee055b9623b9a94be3dd545c67a19
|
2024-06-07 10:38:10 +08:00 |
|
qiwang
|
e851b16c0e
|
fix: update vmInfo 0607
Former-commit-id: 029eeaba931df0f426144aecd537bad26aea03fc
|
2024-06-07 09:53:19 +08:00 |
|
tzwang
|
f4d1587527
|
updated clusterResource model
Former-commit-id: d279ddc8455f59187f28cff53e2b3eb01185f201
|
2024-06-07 09:39:59 +08:00 |
|
qiwang
|
f2fb6bb4ec
|
fix: update vmInfo 060601
Former-commit-id: ccb597154a3af953b990f07aaac678966730cc44
|
2024-06-07 09:12:05 +08:00 |
jagger
|
2f45fef202
|
fix bug
Signed-off-by: jagger <cossjie@foxmail.com>
Former-commit-id: 7ea30faf0152e15a9058fd8da894e5b6d993eb8d
|
2024-06-06 20:59:58 +08:00 |
|
tzwang
|
4d97270321
|
Merge pull request 'fix clusterResouces bugs' (#216) from tzwang/pcm-coordinator:master into master
Former-commit-id: 39e79e58349ec553dfe286fd5d9f5360e02ef627
|
2024-06-06 19:13:00 +08:00 |
|
tzwang
|
ccbf2a00f1
|
fix clusterResouces bugs
Former-commit-id: 52c5b84d8957dd7f2529ce3dd5416ee7ffd9b07d
|
2024-06-06 19:08:51 +08:00 |
|
tzwang
|
83f8865dd2
|
Merge pull request 'fix clusterResouces bugs' (#215) from tzwang/pcm-coordinator:master into master
Former-commit-id: 85a2da220a396c915a756f2f483bfe13abdcfb99
|
2024-06-06 17:13:36 +08:00 |
|
tzwang
|
8ffc0106d7
|
fix clusterResouces bugs
Former-commit-id: c977dc87486fd72df375a92d71c185fac668cb2c
|
2024-06-06 17:10:06 +08:00 |
|
qiwang
|
5db1db5bea
|
Merge pull request 'update vminfo 060601' (#214) from master-wq into master
Former-commit-id: 5c1c0d40d899aca9eb06b0d08a570656b8a629cc
|
2024-06-06 12:28:10 +08:00 |
|
qiwang
|
c2a3b77aff
|
fix: update vmInfo 060601
Former-commit-id: 8d2c4ce27e51ef178a07f6361d5bb7ecb2e0837b
|
2024-06-06 12:24:11 +08:00 |
|
tzwang
|
014d07ba50
|
Merge pull request 'added cron updateClusterResources' (#213) from tzwang/pcm-coordinator:master into master
Former-commit-id: 3189cf9d5f87c69dc75da6b452b46943ab1cb671
|
2024-06-06 10:57:58 +08:00 |
|
tzwang
|
b61e434f75
|
added cron updateClusterResources
Former-commit-id: f38bd68df8012cb81ba9866a0c8b0310511c2427
|
2024-06-06 10:53:48 +08:00 |
|
qiwang
|
04f0eae608
|
Merge pull request 'update vminfo 0606' (#212) from master-wq into master
Former-commit-id: b0960aa18e7cc2fdf05762733d86806ab7b1038c
|
2024-06-06 10:51:13 +08:00 |
|
qiwang
|
a1d6951493
|
fix: update vmInfo 0606
Former-commit-id: 98a2d9812255789f94ed2c859f7b486e3934a6e5
|
2024-06-06 10:47:28 +08:00 |
|
qiwang
|
bf0ae0877d
|
Merge pull request 'update vminfo 0606' (#211) from master-wq into master
Former-commit-id: 1299105095f70f4a210fa8288f59dcb5d88495b7
|
2024-06-06 10:37:46 +08:00 |
|
qiwang
|
db9fe273d8
|
fix: update vmInfo 0606
Former-commit-id: a1711e74b84d91e661c7e6d4257f8967c17cf573
|
2024-06-06 10:30:48 +08:00 |
|
devad
|
8de946e139
|
Merge pull request 'fix bug' (#209) from devad/pcm-coordinator:master into master
Former-commit-id: c354ec6d0aab9ee47275353734258214fbe10fa5
|
2024-06-05 18:36:37 +08:00 |
|
tzwang
|
7694577478
|
Merge pull request 'added updateadpter' (#210) from tzwang/pcm-coordinator:master into master
Former-commit-id: d0aa50329386349b7216169f185b391591c26c35
|
2024-06-05 18:34:45 +08:00 |
|
tzwang
|
da4c0e4717
|
Merge branch 'master' of https://gitlink.org.cn/JointCloud/pcm-coordinator
Former-commit-id: f4d1ca4412d8250a8d4c5ac528707edbb5e4adb8
|
2024-06-05 18:29:53 +08:00 |
|
tzwang
|
cdcbc84372
|
added cron updateadapters
Former-commit-id: 00c5b593ca264313e9848ff214bed1bf350dfff5
|
2024-06-05 18:29:30 +08:00 |
|
jagger
|
255643d246
|
Merge remote-tracking branch 'upstream/master' into upstream
Former-commit-id: b6ced17038c09bc2700532036b2927d658cb3ec8
|
2024-06-05 17:57:27 +08:00 |
|
jagger
|
ba84c312a3
|
fix bug
Signed-off-by: jagger <cossjie@foxmail.com>
Former-commit-id: ac8e28da5b7851f03b2fe1207fcbc83f0eee255e
|
2024-06-05 17:56:59 +08:00 |
|
qiwang
|
7de7d92930
|
Merge pull request 'update vminfo' (#208) from master-wq into master
Former-commit-id: 3d117351d7deb2212470c67dfdaf7ce0a2c06c1b
|
2024-06-05 17:29:56 +08:00 |
|
qiwang
|
f66138afa0
|
Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: e150842727f39e6ad9eb4b83db0197c97af108ea
|
2024-06-05 17:25:22 +08:00 |
|
qiwang
|
c227103dbd
|
fix: update vmInfo
Former-commit-id: 2bfc197d20297aac19e32ae1d3fa71e4647eedcc
|
2024-06-05 17:25:03 +08:00 |
|
zhangwei
|
68e497760f
|
移除多余代码
Former-commit-id: 6e245fdcda9efae192ad676ac3f6c2510df129a3
|
2024-06-05 15:54:25 +08:00 |
|
jagger
|
e29002b4d6
|
fix bug
Signed-off-by: jagger <cossjie@foxmail.com>
Former-commit-id: a6d78147813b92708df308d1c24f717af41168bd
|
2024-06-04 17:36:24 +08:00 |
|
devad
|
a908f671a6
|
Merge pull request 'fix bug' (#207) from devad/pcm-coordinator:master into master
Former-commit-id: ee2394c862032881fcb1703ac0a2ab86eaab6f07
|
2024-06-04 15:27:10 +08:00 |
|
jagger
|
d8e8370e5b
|
fix bug
Signed-off-by: jagger <cossjie@foxmail.com>
Former-commit-id: 53039ebcdb46e353f2dcec112389cad7c3b91432
|
2024-06-04 15:23:16 +08:00 |
|
devad
|
378ed17411
|
Merge pull request 'fix bug' (#206) from devad/pcm-coordinator:master into master
Former-commit-id: 36aa756e181fd39d838c792e8cf71f309280787c
|
2024-05-31 17:13:17 +08:00 |
|
jagger
|
321a054df2
|
fix bug
Signed-off-by: jagger <cossjie@foxmail.com>
Former-commit-id: afd3e450e10a2fc1d7779633540d4f1bf8b8478f
|
2024-05-31 17:09:00 +08:00 |
|
qiwang
|
91e71e1b80
|
Merge pull request 'update vminfo' (#205) from master-wq into master
Former-commit-id: 5fbf4b2e6256fd248296f62d06d8c2193f2594d4
|
2024-05-26 17:30:34 +08:00 |
|
qiwang
|
641a762620
|
fix: update vmInfo
Former-commit-id: fbc9276038394ddf3c0bfb27a216eaa2f96c6abe
|
2024-05-26 17:25:56 +08:00 |
|
qiwang
|
1a089124bb
|
Merge pull request 'update vmInfo' (#204) from master-wq into master
Former-commit-id: d3a873d45cf40e62fe2e9adfa4696e5f7d4bb72e
|
2024-05-25 10:08:04 +08:00 |
|
qiwang
|
79620eacdb
|
Merge pull request 'update vmInfo' (#203) from master-wq into master
Former-commit-id: 7331583d196c3f36280c4c2a55ea6bfe179595e8
|
2024-05-24 16:45:16 +08:00 |
|
qiwang
|
5738c04525
|
Merge remote-tracking branch 'origin/master' into master-wq
Former-commit-id: 6c5ab94b5e5bb2eb9e4bb271563caf0d1ab963fc
|
2024-05-24 16:40:11 +08:00 |
|
qiwang
|
f73f2e8456
|
fix: update vmInfo
Former-commit-id: c3bce348108e72183076232fec484a798c0543da
|
2024-05-24 16:35:22 +08:00 |