Commit Graph

798 Commits

Author SHA1 Message Date
Gallen 245fad1fad basic implement for taskmgr 2018-07-19 14:55:27 +08:00
Firmlyzhu 2b1e59af8f Fix some bugs 2018-07-19 14:40:26 +08:00
zhuyj17 33f2b4a569 add taskcontroller 2018-07-19 14:29:25 +08:00
GallenShao 68a6bb44df
Merge pull request #307 from GallenShao/batch
modify rpc proto
2018-07-17 14:33:41 +08:00
Gallen a670020e8d modify rpc proto 2018-07-17 14:32:49 +08:00
GallenShao 2def08fec3
Merge pull request #306 from GallenShao/batch
modify rpc proto
2018-07-17 14:22:57 +08:00
Gallen b24051bffa modify rpc proto 2018-07-17 14:21:34 +08:00
GallenShao bfb4ba7cd9
Merge pull request #305 from GallenShao/batch
update rpc proto
2018-07-17 13:52:49 +08:00
Gallen 96890bbad0 update rpc proto 2018-07-17 13:46:34 +08:00
Yan Li 1ca750092d
Merge pull request #304 from iteratorlee/dev_batch
fix the path of taskmgr
2018-07-16 20:29:02 +08:00
iteratorlee 660d003fbc fix the path of taskmgr 2018-07-16 20:27:35 +08:00
GallenShao c41bdfbbc8
Merge pull request #303 from GallenShao/batch
simple taskmgr
2018-07-13 10:47:09 +08:00
Gallen 73b23e11e4 simple taskmgr 2018-07-13 10:45:11 +08:00
Yujian Zhu 9582d82ca5
Merge pull request #302 from FirmlyReality/batch
Update to latest code and make it work
2018-07-01 01:29:35 +08:00
zhuyj17 8233d159f7 Update to work 2018-07-01 01:28:16 +08:00
zhuyj17 946efe277f Update locations of gputools, jobmgr and taskmgr 2018-07-01 01:14:23 +08:00
zhuyj17 08e7a44df9 Fix conflict 2018-07-01 01:09:56 +08:00
zhuyj17 4b2506992c Merge branch 'batch' of https://github.com/unias/docklet into batch 2018-07-01 01:03:34 +08:00
amber 4c3b11cc25
Merge pull request #301 from FirmlyReality/tidycode
Tidycode
2018-06-12 10:04:13 +08:00
zhuyj17 95ab1104f4 Tide user and web code 2018-06-11 00:14:41 +08:00
zhuyj17 1315ca0c3a Tidy master code 2018-06-10 23:53:21 +08:00
zhuyj17 183ccb3d21 Rename com to utils 2018-06-04 01:22:50 +08:00
zhuyj17 18d9ea08fd Rename com to utils 2018-06-04 01:16:32 +08:00
zhuyj17 868be0c8c0 Tidy master codes 2018-05-27 17:17:08 +08:00
zhuyj17 9b8a9a7135 Tidy worker codes 2018-05-27 17:09:09 +08:00
zhuyj17 9fb63fb475 Tide worker codes 2018-05-27 17:08:44 +08:00
zhuyj17 c486930d8f tidy worker codes 2018-05-27 15:52:45 +08:00
zhuyj17 1a5632e574 Fix conflict 2018-05-27 14:30:05 +08:00
Gallen 152162f8dc add gpu tools 2018-05-21 14:55:22 +08:00
zhong yehong fbe88b0cbb
Merge pull request #297 from zhongyehong/master
Implement addnode function on aliyun cloud
2018-05-20 17:42:35 +08:00
zhongyehong b40fad7acc Add a parameter to control whether the add node function is enabled. 2018-05-20 17:32:35 +08:00
zhongyehong 490a9901ac allow root change the cloud setting in cloud pannel 2018-05-20 17:16:56 +08:00
zhongyehong 37c9b13e28 Merge remote-tracking branch 'upstream/master' 2018-05-20 16:08:00 +08:00
zhongyehong d3750eb7f8 Implement addnode function on aliyun cloud 2018-05-20 16:05:11 +08:00
zhong yehong 2c2f318b64
Merge pull request #296 from zhongyehong/batch
add frame for batch
2018-05-13 15:29:20 +08:00
zhongyehong 44a68ae51a add frame for batch 2018-05-13 15:26:05 +08:00
zhongyehong 2ca69b8e47 adding scale module 2018-05-13 13:21:17 +08:00
Yujian Zhu 16cfef3219
Merge pull request #295 from FirmlyReality/file2db
File2db
2018-04-22 16:03:55 +08:00
zhuyj17 03df782f62 Merge branch 'master' of https://github.com/unias/docklet into file2db 2018-04-22 15:59:09 +08:00
zhuyj17 3e999e4511 1.Fix bugs on upgrade script. 2. Can't add port mappings when cluster is stopped. 2018-04-22 15:58:41 +08:00
zhuyj17 5d8abf2d44 Add a python script to upgrade 2018-04-22 15:21:19 +08:00
zhong yehong b82498eae9
Merge pull request #294 from zhongyehong/master
Modified recovery mode
2018-04-22 14:47:26 +08:00
zhongyehong 984819686e fix a bug caused by merge 2018-04-22 14:45:04 +08:00
zhongyehong 867ee221b6 fix a bug of displaying copy button 2018-04-22 14:23:32 +08:00
zhongyehong d5bc0e583d Merge remote-tracking branch 'upstream/master' 2018-04-22 14:06:43 +08:00
zhongyehong 39fcf8a26f Modified recovery mode 2018-04-22 14:03:41 +08:00
zhuyj17 0cbb288175 Add BillingHistory model and fix a bug when use db to bill 2018-04-22 12:39:54 +08:00
Yujian Zhu 7ba93cfa65
Merge pull request #293 from FirmlyReality/file2db
Use database when operating on clusters, containers, ports mappings and images.
2018-04-15 23:50:58 +08:00
zhuyj17 d959b6f23e Update copy image to use db 2018-04-15 22:52:00 +08:00
zhuyj17 c152d8650a Fix conlicts 2018-04-14 00:25:05 +08:00